Skip to content

Commit 5b6700b

Browse files
aws-application-signals-botgithub-actionsezhang6811ADOT Patch workflow
authored
Nightly dependency update: OpenTelemetry 2.26.1/1.54.0 (#1342)
Automated update of OpenTelemetry dependencies. **Build Status:** ❌ [failure](https://github.com/aws-observability/aws-otel-java-instrumentation/actions/runs/23558572784) **Updated versions:** - [OpenTelemetry Java Instrumentation](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.26.1): 2.26.1 - [OpenTelemetry Java Contrib](https://github.com/open-telemetry/opentelemetry-java-contrib/releases/tag/v1.54.0): 1.54.0 **Upstream releases with breaking changes:** Note: the mechanism to detect upstream breaking changes is not perfect. Be sure to check all new releases and understand if any additional changes need to be addressed. **opentelemetry-java-instrumentation:** - [Version 2.26.0](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v2.26.0) --------- Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: Eric Zhang <zhaez@amazon.com> Co-authored-by: ADOT Patch workflow <adot-patch-workflow@github.com>
1 parent 502c555 commit 5b6700b

6 files changed

Lines changed: 20 additions & 17 deletions

File tree

.github/patches/versions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
OTEL_JAVA_INSTRUMENTATION_VERSION=v2.25.0
1+
OTEL_JAVA_INSTRUMENTATION_VERSION=v2.26.1
22
OTEL_JAVA_CONTRIB_VERSION=v1.54.0

CHANGELOG.md

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ If your change does not need a CHANGELOG entry, add the "skip changelog" label t
1313

1414
## Unreleased
1515

16+
- Bump OpenTelemetry Java Instrumentation version to 2.26.1
17+
([#1342](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1342))
1618
- End support for ADOT Java 1.x: remove v1 image scans and update README#1339
1719
([#1339](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1339))
1820

@@ -34,13 +36,6 @@ If your change does not need a CHANGELOG entry, add the "skip changelog" label t
3436
- Upgrade jackson-bom to 2.21.1 to fix CVE GHSA-72hv-8253-57qq
3537
([#1334](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1334))
3638

37-
## v2.25.1 - 2026-03-11
38-
39-
- feat: Allow disabling of default anomaly condition
40-
([#1329](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1329))
41-
- Upgrade jackson-bom to 2.21.1 to fix CVE GHSA-72hv-8253-57qq
42-
([#1334](https://github.com/aws-observability/aws-otel-java-instrumentation/pull/1334))
43-
4439
## v2.23.0 - 2026-01-24
4540

4641
### Enhancements

awsagentprovider/src/main/java/software/amazon/opentelemetry/javaagent/providers/AwsApplicationSignalsCustomizerProvider.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@
3636
import io.opentelemetry.sdk.autoconfigure.spi.ConfigurationException;
3737
import io.opentelemetry.sdk.logs.export.LogRecordExporter;
3838
import io.opentelemetry.sdk.metrics.Aggregation;
39+
import io.opentelemetry.sdk.metrics.InstrumentSelector;
3940
import io.opentelemetry.sdk.metrics.InstrumentType;
4041
import io.opentelemetry.sdk.metrics.SdkMeterProvider;
4142
import io.opentelemetry.sdk.metrics.SdkMeterProviderBuilder;
43+
import io.opentelemetry.sdk.metrics.View;
4244
import io.opentelemetry.sdk.metrics.export.MetricExporter;
4345
import io.opentelemetry.sdk.metrics.export.MetricReader;
4446
import io.opentelemetry.sdk.metrics.export.PeriodicMetricReader;
@@ -415,6 +417,12 @@ private SdkTracerProviderBuilder customizeTracerProviderBuilder(
415417
SdkMeterProvider.builder()
416418
.setResource(ResourceHolder.getResource())
417419
.registerMetricReader(metricReader)
420+
// Drop SDK internal telemetry metrics (e.g.
421+
// otel.sdk.metric_reader.collection.duration added in OTel SDK 1.60.0) to
422+
// avoid exporting them to the Application Signals endpoint.
423+
.registerView(
424+
InstrumentSelector.builder().setMeterName("io.opentelemetry.sdk.metrics").build(),
425+
View.builder().setAggregation(Aggregation.drop()).build())
418426
.build();
419427

420428
// Construct and set application signals metrics processor

dependencyManagement/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ data class DependencySet(val group: String, val version: String, val modules: Li
2727
val testSnapshots = rootProject.findProperty("testUpstreamSnapshots") == "true"
2828

2929
// This is the version of the upstream instrumentation BOM
30-
val otelVersion = "2.25.0"
31-
val otelSnapshotVersion = "2.26.0"
30+
val otelVersion = "2.26.1"
31+
val otelSnapshotVersion = "2.27.0"
3232
val otelAlphaVersion = if (!testSnapshots) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
3333
val otelJavaAgentVersion = if (!testSnapshots) otelVersion else "$otelSnapshotVersion-SNAPSHOT"
3434
// All versions below are only used in testing and do not affect the released artifact.

lambda-layer/patches/aws-otel-java-instrumentation.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ index 6ca4ff5..97e211a 100644
66
val testSnapshots = rootProject.findProperty("testUpstreamSnapshots") == "true"
77

88
// This is the version of the upstream instrumentation BOM
9-
-val otelVersion = "2.25.0"
10-
+val otelVersion = "2.25.0-adot-lambda1"
11-
val otelSnapshotVersion = "2.26.0"
9+
-val otelVersion = "2.26.1"
10+
+val otelVersion = "2.26.1-adot-lambda1"
11+
val otelSnapshotVersion = "2.27.0"
1212
val otelAlphaVersion = if (!testSnapshots) "$otelVersion-alpha" else "$otelSnapshotVersion-alpha-SNAPSHOT"
1313
val otelJavaAgentVersion = if (!testSnapshots) otelVersion else "$otelSnapshotVersion-SNAPSHOT"

lambda-layer/patches/opentelemetry-java-instrumentation.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -678,10 +678,10 @@ index a46c2d24de..71a2264042 100644
678678
--- a/version.gradle.kts
679679
+++ b/version.gradle.kts
680680
@@ -1,5 +1,5 @@
681-
-val stableVersion = "2.25.0"
682-
-val alphaVersion = "2.25.0-alpha"
683-
+val stableVersion = "2.25.0-adot-lambda1"
684-
+val alphaVersion = "2.25.0-adot-lambda1-alpha"
681+
-val stableVersion = "2.26.1"
682+
-val alphaVersion = "2.26.1-alpha"
683+
+val stableVersion = "2.26.1-adot-lambda1"
684+
+val alphaVersion = "2.26.1-adot-lambda1-alpha"
685685

686686
allprojects {
687687
if (findProperty("otel.stable") != "true") {

0 commit comments

Comments
 (0)