Skip to content

Cleanup SpecIT logging configuration #143365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
idegtiarenko merged 1 commit into from
Mar 3, 2026
Merged

Cleanup SpecIT logging configuration #143365

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions ...lti-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/multi_node/EsqlSpecIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,11 @@
import org.junit.ClassRule;

import java.io.IOException;
import java.util.Map;

public class EsqlSpecIT extends EsqlSpecTestCase {
@ClassRule
public static ElasticsearchCluster cluster = Clusters.testCluster(spec -> {
spec.plugin("inference-service-test");
for (Map.Entry<String, String> entry : LOGGING_CLUSTER_SETTINGS.entrySet()) {
spec.setting(entry.getKey(), entry.getValue());
}
spec.plugin("inference-service-test").settings(nodeSpec -> LOGGING_CLUSTER_SETTINGS);
});

@Override
Expand Down
10 changes: 0 additions & 10 deletions ...ngle-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/Clusters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@

import org.elasticsearch.test.cluster.ElasticsearchCluster;
import org.elasticsearch.test.cluster.local.LocalClusterConfigProvider;
import org.elasticsearch.test.cluster.local.LocalClusterSpecBuilder;
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
import org.elasticsearch.xpack.esql.qa.rest.EsqlSpecTestCase;

import java.util.Map;

public class Clusters {

Expand All @@ -30,10 +26,4 @@ public static ElasticsearchCluster testCluster(LocalClusterConfigProvider config
.apply(() -> configProvider)
.build();
}

public static void addAdditionalLoggingSettings(LocalClusterSpecBuilder<?> spec) {
for (Map.Entry<String, String> entry : EsqlSpecTestCase.LOGGING_CLUSTER_SETTINGS.entrySet()) {
spec.setting(entry.getKey(), entry.getValue());
}
}
}
5 changes: 3 additions & 2 deletions ...le-node/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/EsqlSpecIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@
public class EsqlSpecIT extends EsqlSpecTestCase {
@ClassRule
public static ElasticsearchCluster cluster = Clusters.testCluster(spec -> {
spec.plugin("inference-service-test").setting("logger." + ComputeService.class.getName(), "DEBUG"); // So we log a profile
Clusters.addAdditionalLoggingSettings(spec);
spec.plugin("inference-service-test")
.setting("logger." + ComputeService.class.getName(), "DEBUG") // So we log a profile
.settings(nodeSpec -> LOGGING_CLUSTER_SETTINGS);
});

public EsqlSpecIT(String fileName, String groupName, String testName, Integer lineNumber, CsvTestCase testCase, String instructions) {
Expand Down
3 changes: 1 addition & 2 deletions ...e/src/javaRestTest/java/org/elasticsearch/xpack/esql/qa/single_node/GenerativeForkIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
public class GenerativeForkIT extends GenerativeForkRestTest {
@ClassRule
public static ElasticsearchCluster cluster = Clusters.testCluster(spec -> {
spec.plugin("inference-service-test");
Clusters.addAdditionalLoggingSettings(spec);
spec.plugin("inference-service-test").settings(nodeSpec -> LOGGING_CLUSTER_SETTINGS);
});

@Override
Expand Down