github-mirrors/elasticsearch
1
0
Fork 0
mirror of https://github.com/elastic/elasticsearch.git synced 2025-06-28 09:28:55 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update elastic-apm-agent to support Java 24 (#123052)

Browse source 
Updates elastic-apm-agent to 1.52.2 to support Java 24.
This commit is contained in:
Alexey Ivanov 2025-02-28 00:14:33 +00:00 • committed by GitHub
parent d9c0ef156a
commit ab835a96b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 5 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gradle/verification-metadata.xml
View file

@ -69,9 +69,9 @@
<sha256 value="10fe288fd7a2cdaf5175332b73529f9abf8fd54dcfff317d6967c0c35ffb133b" origin="Generated by Gradle"/> <sha256 value="10fe288fd7a2cdaf5175332b73529f9abf8fd54dcfff317d6967c0c35ffb133b" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="co.elastic.apm" name="elastic-apm-agent" version="1.52.0"> <component group="co.elastic.apm" name="elastic-apm-agent" version="1.52.2">
<artifact name="elastic-apm-agent-1.52.0.jar"> <artifact name="elastic-apm-agent-1.52.2.jar">
<sha256 value="ef6c8f75bd6181e717cdd172864441580708c7ee8543175621a3f404f4ba6429" origin="Generated by Gradle"/> <sha256 value="dee18355a06f66a425bd597d6447ccbe7e8b7a3c0667adb7b30da173e31044e0" origin="Generated by Gradle"/>
</artifact> </artifact>
</component> </component>
<component group="co.elastic.logging" name="ecs-logging-core" version="1.2.0"> <component group="co.elastic.logging" name="ecs-logging-core" version="1.2.0">

2
modules/apm/build.gradle
View file

@ -20,7 +20,7 @@ dependencies {
implementation "io.opentelemetry:opentelemetry-api:${otelVersion}" implementation "io.opentelemetry:opentelemetry-api:${otelVersion}"
implementation "io.opentelemetry:opentelemetry-context:${otelVersion}" implementation "io.opentelemetry:opentelemetry-context:${otelVersion}"
implementation "io.opentelemetry:opentelemetry-semconv:${otelSemconvVersion}" 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(':modules:apm')
javaRestTestImplementation project(':test:framework') javaRestTestImplementation project(':test:framework')

3
muted-tests.yml
View file

@ -296,9 +296,6 @@ tests:
- class: org.elasticsearch.test.apmintegration.TracesApmIT - class: org.elasticsearch.test.apmintegration.TracesApmIT
method: testApmIntegration method: testApmIntegration
issue: https://github.com/elastic/elasticsearch/issues/122129 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 - class: org.elasticsearch.repositories.gcs.GoogleCloudStorageServiceTests
method: testClientsAreNotSharedAcrossRepositories method: testClientsAreNotSharedAcrossRepositories
issue: https://github.com/elastic/elasticsearch/issues/123090 issue: https://github.com/elastic/elasticsearch/issues/123090

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

@ -127,7 +127,7 @@ public class MetricsApmIT extends ESRestTestCase {
var completed = finished.await(30, TimeUnit.SECONDS); var completed = finished.await(30, TimeUnit.SECONDS);
var remainingAssertions = Stream.concat(valueAssertions.keySet().stream(), histogramAssertions.keySet().stream()) 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); assertTrue("Timeout when waiting for assertions to complete. Remaining assertions to match: " + remainingAssertions, completed);
} }