Skip to content

[9.2] Adjust test fixture lifecycle ordering in apm integration tests (#136926) #136970

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
merged 1 commit into from
Oct 22, 2025
Merged

[9.2] Adjust test fixture lifecycle ordering in apm integration tests (#136926) #136970

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
36 changes: 31 additions & 5 deletions ...-integration/src/javaRestTest/java/org/elasticsearch/test/apmintegration/TracesApmIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
import org.hamcrest.Matcher;
import org.hamcrest.StringDescription;
import org.junit.ClassRule;
import org.junit.Rule;
import org.junit.rules.TestRule;
import org.junit.runners.model.Statement;

import java.io.IOException;
import java.util.Arrays;
Expand All @@ -43,20 +44,45 @@ public class TracesApmIT extends ESRestTestCase {
final String traceIdValue = "0af7651916cd43dd8448eb211c80319c";
final String traceParentValue = "00-" + traceIdValue + "-b7ad6b7169203331-01";

@ClassRule
public static RecordingApmServer mockApmServer = new RecordingApmServer();

@Rule
public ElasticsearchCluster cluster = ElasticsearchCluster.local()
public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
.distribution(DistributionType.INTEG_TEST)
.module("test-apm-integration")
.module("apm")
.setting("telemetry.metrics.enabled", "false")
.setting("telemetry.tracing.enabled", "true")
.setting("telemetry.agent.metrics_interval", "1s")
.setting("telemetry.agent.server_url", "http://127.0.0.1:" + mockApmServer.getPort())
.setting("telemetry.agent.server_url", () -> "http://127.0.0.1:" + mockApmServer.getPort())
.build();

@ClassRule
// Custom test rule which manually orders test fixtures. A RuleChain won't work here due to the specific order we require, which is:
// 1. Start the mock APM server
// 2. Start ES cluster
// 3. Run the test
// 4. Stop the mock APM server
// 5. Stop ES cluster
public static TestRule rule = (base, description) -> {
return new Statement() {
@Override
public void evaluate() throws Throwable {
mockApmServer.before();
Statement s = new Statement() {
@Override
public void evaluate() throws Throwable {
try {
base.evaluate();
} finally {
mockApmServer.after();
}
}
};
cluster.apply(s, description).evaluate();
}
};
};

@Override
protected String getTestRestCluster() {
return cluster.getHttpAddresses();
Expand Down