Skip to content

Commit 939685b

Browse files
Update elastic-apm-agent to support Java 24 (#123052) (#123703)
Updates elastic-apm-agent to 1.52.2 to support Java 24. (cherry picked from commit ab835a9) # Conflicts: # muted-tests.yml Co-authored-by: Alexey Ivanov <[email protected]>
1 parent 3397806 commit 939685b

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

gradle/verification-metadata.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,9 @@
6969
<sha256 value="10fe288fd7a2cdaf5175332b73529f9abf8fd54dcfff317d6967c0c35ffb133b" origin="Generated by Gradle"/>
7070
</artifact>
7171
</component>
72-
<component group="co.elastic.apm" name="elastic-apm-agent" version="1.52.0">
73-
<artifact name="elastic-apm-agent-1.52.0.jar">
74-
<sha256 value="ef6c8f75bd6181e717cdd172864441580708c7ee8543175621a3f404f4ba6429" origin="Generated by Gradle"/>
72+
<component group="co.elastic.apm" name="elastic-apm-agent" version="1.52.2">
73+
<artifact name="elastic-apm-agent-1.52.2.jar">
74+
<sha256 value="dee18355a06f66a425bd597d6447ccbe7e8b7a3c0667adb7b30da173e31044e0" origin="Generated by Gradle"/>
7575
</artifact>
7676
</component>
7777
<component group="co.elastic.logging" name="ecs-logging-core" version="1.2.0">

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.2"
2424

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

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)