Skip to content

Commit 981994d

Browse files
Update elastic-apm-agent to support Java 24
1 parent d1b7639 commit 981994d

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

gradle/verification-metadata.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@
7474
<sha256 value="ef6c8f75bd6181e717cdd172864441580708c7ee8543175621a3f404f4ba6429" origin="Generated by Gradle"/>
7575
</artifact>
7676
</component>
77+
<component group="co.elastic.apm" name="elastic-apm-agent" version="1.52.1">
78+
<artifact name="elastic-apm-agent-1.52.1.jar">
79+
<sha256 value="012198acf124830b2b8c7edc63b7ce9036bc3353e0074eb1cbb9fd6ce3b92da4" origin="Generated by Gradle"/>
80+
</artifact>
81+
</component>
7782
<component group="co.elastic.logging" name="ecs-logging-core" version="1.2.0">
7883
<artifact name="ecs-logging-core-1.2.0.jar">
7984
<sha256 value="0d6318af29848ea588b1c244834e3e762315c68de2bcfc9f1adf3f0633d22d37" origin="Generated by Gradle"/>

modules/apm/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ dependencies {
2020
implementation "io.opentelemetry:opentelemetry-api:${otelVersion}"
2121
implementation "io.opentelemetry:opentelemetry-context:${otelVersion}"
2222
implementation "io.opentelemetry:opentelemetry-semconv:${otelSemconvVersion}"
23-
runtimeOnly "co.elastic.apm:elastic-apm-agent:1.52.0"
23+
runtimeOnly "co.elastic.apm:elastic-apm-agent:1.52.1"
2424

2525
javaRestTestImplementation project(':modules:apm')
2626
javaRestTestImplementation project(':test:framework')

muted-tests.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -326,9 +326,6 @@ tests:
326326
- class: org.elasticsearch.test.apmintegration.TracesApmIT
327327
method: testApmIntegration
328328
issue: https://github.com/elastic/elasticsearch/issues/122129
329-
- class: org.elasticsearch.test.apmintegration.MetricsApmIT
330-
method: testApmIntegration
331-
issue: https://github.com/elastic/elasticsearch/issues/123022
332329

333330
# Examples:
334331
#

test/external-modules/apm-integration/src/javaRestTest/java/org/elasticsearch/test/apmintegration/MetricsApmIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public void testApmIntegration() throws Exception {
127127

128128
var completed = finished.await(30, TimeUnit.SECONDS);
129129
var remainingAssertions = Stream.concat(valueAssertions.keySet().stream(), histogramAssertions.keySet().stream())
130-
.collect(Collectors.joining());
130+
.collect(Collectors.joining(","));
131131
assertTrue("Timeout when waiting for assertions to complete. Remaining assertions to match: " + remainingAssertions, completed);
132132
}
133133

0 commit comments

Comments
 (0)