Skip to content

Update upstream OpenTelemetry agent dependencies to 2.29.0 #1144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SylvainJuge merged 5 commits into from
Jun 22, 2026
Merged

Update upstream OpenTelemetry agent dependencies to 2.29.0 #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b69a560
chore: Update upstream OpenTelemetry agent version and related depend...
elastic-observability-automation[bot] Jun 19, 2026
277269c
generate changelog entry
obltmachine Jun 19, 2026
31e7b57
fix import
SylvainJuge Jun 19, 2026
5033c3b
fix tests
SylvainJuge Jun 19, 2026
928ee4d
bump contrib version to fix opamp
SylvainJuge Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions ...ain/java/co/elastic/otel/declarativeconfig/ElasticDeclarativeConfigurationCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions custom/src/test/java/co/elastic/otel/declarativeconfig/DefaultDeclarativeConfigTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion ...java/co/elastic/otel/declarativeconfig/ElasticDeclarativeConfigurationCustomizerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions docs/changelog/upstream-update.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ 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
opentelemetryContribAlpha = "1.57.0-alpha"
opentelemetryContribAlpha = "1.58.0-alpha"

# otel semconv
# 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]

Expand Down
Loading