From ab835a96b10f01eebff04a11c55060d2ad8ff598 Mon Sep 17 00:00:00 2001 From: Alexey Ivanov Date: Fri, 28 Feb 2025 00:14:33 +0000 Subject: [PATCH] Update elastic-apm-agent to support Java 24 (#123052) Updates elastic-apm-agent to 1.52.2 to support Java 24. --- gradle/verification-metadata.xml | 6 +++--- modules/apm/build.gradle | 2 +- muted-tests.yml | 3 --- .../org/elasticsearch/test/apmintegration/MetricsApmIT.java | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 526891c7abb2..c5f64342689f 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -69,9 +69,9 @@ - - - + + + diff --git a/modules/apm/build.gradle b/modules/apm/build.gradle index de50d88a46d7..86d06258bcbc 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.0" + runtimeOnly "co.elastic.apm:elastic-apm-agent:1.52.2" javaRestTestImplementation project(':modules:apm') javaRestTestImplementation project(':test:framework') diff --git a/muted-tests.yml b/muted-tests.yml index 0670623e65b2..4805f578613a 100644 --- a/muted-tests.yml +++ b/muted-tests.yml @@ -296,9 +296,6 @@ tests: - class: org.elasticsearch.test.apmintegration.TracesApmIT method: testApmIntegration issue: https://github.com/elastic/elasticsearch/issues/122129 -- class: org.elasticsearch.test.apmintegration.MetricsApmIT - method: testApmIntegration - issue: https://github.com/elastic/elasticsearch/issues/123022 - class: org.elasticsearch.repositories.gcs.GoogleCloudStorageServiceTests method: testClientsAreNotSharedAcrossRepositories issue: https://github.com/elastic/elasticsearch/issues/123090 diff --git a/test/external-modules/apm-integration/src/javaRestTest/java/org/elasticsearch/test/apmintegration/MetricsApmIT.java b/test/external-modules/apm-integration/src/javaRestTest/java/org/elasticsearch/test/apmintegration/MetricsApmIT.java index e974c31bf5c0..07141846dde4 100644 --- a/test/external-modules/apm-integration/src/javaRestTest/java/org/elasticsearch/test/apmintegration/MetricsApmIT.java +++ b/test/external-modules/apm-integration/src/javaRestTest/java/org/elasticsearch/test/apmintegration/MetricsApmIT.java @@ -127,7 +127,7 @@ public class MetricsApmIT extends ESRestTestCase { var completed = finished.await(30, TimeUnit.SECONDS); var remainingAssertions = Stream.concat(valueAssertions.keySet().stream(), histogramAssertions.keySet().stream()) - .collect(Collectors.joining()); + .collect(Collectors.joining(",")); assertTrue("Timeout when waiting for assertions to complete. Remaining assertions to match: " + remainingAssertions, completed); }