From ebcccd282a348ed338e096c4724ac58364928172 Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Mon, 11 Aug 2025 12:07:44 -0700 Subject: [PATCH] Use java8 variant of apm-agent (#132651) This commit changes the apm-agent dependency to the java8 variant. The current dependency has a minimum java7 version, which restricts the dependency upgrades it can do. (cherry picked from commit c91871f6f57b27e800a55b198f630aecfa70d640) # Conflicts: # gradle/verification-metadata.xml # modules/apm/build.gradle --- .../java/org/elasticsearch/server/cli/APMJvmOptions.java | 2 +- .../org/elasticsearch/server/cli/APMJvmOptionsTests.java | 2 +- docs/changelog/132651.yaml | 5 +++++ gradle/verification-metadata.xml | 6 +++--- modules/apm/build.gradle | 2 +- ...gent-LICENSE.txt => elastic-apm-agent-java8-LICENSE.txt} | 0 ...-agent-NOTICE.txt => elastic-apm-agent-java8-NOTICE.txt} | 0 server/src/main/java/org/elasticsearch/node/Node.java | 2 +- 8 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 docs/changelog/132651.yaml rename modules/apm/licenses/{elastic-apm-agent-LICENSE.txt => elastic-apm-agent-java8-LICENSE.txt} (100%) rename modules/apm/licenses/{elastic-apm-agent-NOTICE.txt => elastic-apm-agent-java8-NOTICE.txt} (100%) diff --git a/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/APMJvmOptions.java b/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/APMJvmOptions.java index c3b9768946767..7633851602953 100644 --- a/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/APMJvmOptions.java +++ b/distribution/tools/server-cli/src/main/java/org/elasticsearch/server/cli/APMJvmOptions.java @@ -369,7 +369,7 @@ static Path findAgentJar(String installDir) throws IOException, UserException { try (var apmStream = Files.list(apmModule)) { final List paths = apmStream.filter( - path -> path.getFileName().toString().matches("elastic-apm-agent-\\d+\\.\\d+\\.\\d+\\.jar") + path -> path.getFileName().toString().matches("elastic-apm-agent-java8-\\d+\\.\\d+\\.\\d+\\.jar") ).toList(); if (paths.size() > 1) { diff --git a/distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/APMJvmOptionsTests.java b/distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/APMJvmOptionsTests.java index 7beaef36709fa..3c79944ec2900 100644 --- a/distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/APMJvmOptionsTests.java +++ b/distribution/tools/server-cli/src/test/java/org/elasticsearch/server/cli/APMJvmOptionsTests.java @@ -190,7 +190,7 @@ private Path makeFakeAgentJar() throws IOException { Path tempFile = createTempFile(); Path apmPathDir = tempFile.getParent().resolve("modules").resolve("apm"); Files.createDirectories(apmPathDir); - Path apmAgentFile = apmPathDir.resolve("elastic-apm-agent-0.0.0.jar"); + Path apmAgentFile = apmPathDir.resolve("elastic-apm-agent-java8-0.0.0.jar"); Files.move(tempFile, apmAgentFile); return tempFile.getParent(); diff --git a/docs/changelog/132651.yaml b/docs/changelog/132651.yaml new file mode 100644 index 0000000000000..4e01ebdb6e3b3 --- /dev/null +++ b/docs/changelog/132651.yaml @@ -0,0 +1,5 @@ +pr: 132651 +summary: Use java8 variant of apm-agent +area: Infra/Core +type: upgrade +issues: [] diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index a247e63ba2b97..b5020e5368688 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -72,9 +72,9 @@ - - - + + + diff --git a/modules/apm/build.gradle b/modules/apm/build.gradle index 86d06258bcbca..83d988e966899 100644 --- a/modules/apm/build.gradle +++ b/modules/apm/build.gradle @@ -20,7 +20,7 @@ dependencies { implementation "io.opentelemetry:opentelemetry-api:${otelVersion}" implementation "io.opentelemetry:opentelemetry-context:${otelVersion}" implementation "io.opentelemetry:opentelemetry-semconv:${otelSemconvVersion}" - runtimeOnly "co.elastic.apm:elastic-apm-agent:1.52.2" + runtimeOnly "co.elastic.apm:elastic-apm-agent-java8:1.55.0" javaRestTestImplementation project(':modules:apm') javaRestTestImplementation project(':test:framework') diff --git a/modules/apm/licenses/elastic-apm-agent-LICENSE.txt b/modules/apm/licenses/elastic-apm-agent-java8-LICENSE.txt similarity index 100% rename from modules/apm/licenses/elastic-apm-agent-LICENSE.txt rename to modules/apm/licenses/elastic-apm-agent-java8-LICENSE.txt diff --git a/modules/apm/licenses/elastic-apm-agent-NOTICE.txt b/modules/apm/licenses/elastic-apm-agent-java8-NOTICE.txt similarity index 100% rename from modules/apm/licenses/elastic-apm-agent-NOTICE.txt rename to modules/apm/licenses/elastic-apm-agent-java8-NOTICE.txt diff --git a/server/src/main/java/org/elasticsearch/node/Node.java b/server/src/main/java/org/elasticsearch/node/Node.java index 3550050bbb6fe..daf9442f1eed8 100644 --- a/server/src/main/java/org/elasticsearch/node/Node.java +++ b/server/src/main/java/org/elasticsearch/node/Node.java @@ -235,7 +235,7 @@ public static void deleteTemporaryApmConfig(JvmInfo jvmInfo, BiConsumer