From b69a56018450983ce2a3994477c31612fe688141 Mon Sep 17 00:00:00 2001 From: "elastic-observability-automation[bot]" <180520183+elastic-observability-automation[bot]@users.noreply.github.com> Date: Fri, 19 Jun 2026 07:46:53 +0000 Subject: [PATCH 1/5] chore: Update upstream OpenTelemetry agent version and related depend... MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ... encies Made with ❤️️ by updatecli --- gradle/libs.versions.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 38cf472f..becf3861 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ opentelemetryProto = "1.3.2-alpha" # otel agent, we rely on the '*-alpha' and get the non-alpha dependencies transitively # updated from upstream agent with .ci/update-upstream.sh -opentelemetryJavaagentAlpha = "2.28.1-alpha" +opentelemetryJavaagentAlpha = "2.29.0-alpha" # otel contrib # updated from upstream agent with .ci/update-upstream.sh @@ -21,8 +21,8 @@ opentelemetryContribAlpha = "1.57.0-alpha" # updated from upstream agent with .ci/update-upstream.sh # While the semconv stable/incubating artifacts are provided as transitive dependencies, keeping # an explicit version here allows to easily override to a not-yet-released version. -opentelemetrySemconv = "1.41.1" -opentelemetrySemconvAlpha = "1.41.1-alpha" +opentelemetrySemconv = "1.42.0" +opentelemetrySemconvAlpha = "1.42.0-alpha" [libraries] From 277269c00374b0ddb19fe07a86284494fc6f3b8a Mon Sep 17 00:00:00 2001 From: obltmachine Date: Fri, 19 Jun 2026 07:47:20 +0000 Subject: [PATCH 2/5] generate changelog entry --- docs/changelog/upstream-update.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/changelog/upstream-update.yaml b/docs/changelog/upstream-update.yaml index 1f481588..923eb9df 100644 --- a/docs/changelog/upstream-update.yaml +++ b/docs/changelog/upstream-update.yaml @@ -1,6 +1,6 @@ prs: -- https://github.com/elastic/elastic-otel-java/pull/1110 +- https://github.com/elastic/elastic-otel-java/pull/1144 type: enhancement products: - product: edot-java -title: Update upstream OpenTelemetry agent dependencies to 2.28.1 +title: Update upstream OpenTelemetry agent dependencies to 2.29.0 From 31e7b574f558cb7b694b30c527c1f9fa984ccd2b Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Fri, 19 Jun 2026 10:27:35 +0200 Subject: [PATCH 3/5] fix import --- ...ticDeclarativeConfigurationCustomizer.java | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/custom/src/main/java/co/elastic/otel/declarativeconfig/ElasticDeclarativeConfigurationCustomizer.java b/custom/src/main/java/co/elastic/otel/declarativeconfig/ElasticDeclarativeConfigurationCustomizer.java index 2704d4c7..a2b44e4a 100644 --- a/custom/src/main/java/co/elastic/otel/declarativeconfig/ElasticDeclarativeConfigurationCustomizer.java +++ b/custom/src/main/java/co/elastic/otel/declarativeconfig/ElasticDeclarativeConfigurationCustomizer.java @@ -26,26 +26,26 @@ import com.google.auto.service.AutoService; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizerProvider; -import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchLogRecordProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.BatchSpanProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalResourceDetectionModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalResourceDetectorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LogRecordExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.LoggerProviderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.MeterProviderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.NameStringValuePairModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpGrpcExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpGrpcMetricExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpHttpExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OtlpHttpMetricExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PeriodicMetricReaderModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.PushMetricExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ResourceModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SimpleLogRecordProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SimpleSpanProcessorModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SpanExporterModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.TracerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchLogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.BatchSpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectionModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalResourceDetectorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LogRecordExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.LoggerProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.MeterProviderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.NameStringValuePairModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpGrpcExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpGrpcMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OtlpHttpMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PeriodicMetricReaderModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.PushMetricExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ResourceModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SimpleLogRecordProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SimpleSpanProcessorModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SpanExporterModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.TracerProviderModel; import java.util.ArrayList; import java.util.Collections; import java.util.List; From 5033c3bfc9f23751427bfdbed898ca81f3ddcda0 Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Fri, 19 Jun 2026 11:07:23 +0200 Subject: [PATCH 4/5] fix tests --- .../declarativeconfig/DefaultDeclarativeConfigTest.java | 8 ++++---- .../ElasticDeclarativeConfigurationCustomizerTest.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/custom/src/test/java/co/elastic/otel/declarativeconfig/DefaultDeclarativeConfigTest.java b/custom/src/test/java/co/elastic/otel/declarativeconfig/DefaultDeclarativeConfigTest.java index c77b3b73..92ea60e2 100644 --- a/custom/src/test/java/co/elastic/otel/declarativeconfig/DefaultDeclarativeConfigTest.java +++ b/custom/src/test/java/co/elastic/otel/declarativeconfig/DefaultDeclarativeConfigTest.java @@ -25,10 +25,10 @@ import io.opentelemetry.javaagent.tooling.resources.ResourceCustomizerProvider; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfiguration; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalComposableRuleBasedSamplerRuleModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.ExperimentalLanguageSpecificInstrumentationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; -import io.opentelemetry.sdk.declarativeconfig.internal.model.SamplerModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalComposableRuleBasedSamplerRuleModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.ExperimentalLanguageSpecificInstrumentationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.SamplerModel; import java.io.InputStream; import java.util.List; import java.util.function.Consumer; diff --git a/custom/src/test/java/co/elastic/otel/declarativeconfig/ElasticDeclarativeConfigurationCustomizerTest.java b/custom/src/test/java/co/elastic/otel/declarativeconfig/ElasticDeclarativeConfigurationCustomizerTest.java index e18a488a..5f068b9e 100644 --- a/custom/src/test/java/co/elastic/otel/declarativeconfig/ElasticDeclarativeConfigurationCustomizerTest.java +++ b/custom/src/test/java/co/elastic/otel/declarativeconfig/ElasticDeclarativeConfigurationCustomizerTest.java @@ -26,7 +26,7 @@ import io.opentelemetry.javaagent.tooling.resources.ResourceCustomizerProvider; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizer; import io.opentelemetry.sdk.autoconfigure.declarativeconfig.DeclarativeConfigurationCustomizerProvider; -import io.opentelemetry.sdk.declarativeconfig.internal.model.OpenTelemetryConfigurationModel; +import io.opentelemetry.sdk.autoconfigure.declarativeconfig.model.OpenTelemetryConfigurationModel; import io.opentelemetry.sdk.logs.export.LogRecordExporter; import io.opentelemetry.sdk.metrics.export.MetricExporter; import io.opentelemetry.sdk.trace.export.SpanExporter; From 928ee4d1c6098ec404dfe66b84b9bea4367fca4e Mon Sep 17 00:00:00 2001 From: Sylvain Juge <763082+SylvainJuge@users.noreply.github.com> Date: Mon, 22 Jun 2026 11:27:36 +0200 Subject: [PATCH 5/5] bump contrib version to fix opamp --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index becf3861..840b13ea 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -15,7 +15,7 @@ opentelemetryJavaagentAlpha = "2.29.0-alpha" # otel contrib # updated from upstream agent with .ci/update-upstream.sh -opentelemetryContribAlpha = "1.57.0-alpha" +opentelemetryContribAlpha = "1.58.0-alpha" # otel semconv # updated from upstream agent with .ci/update-upstream.sh