From d6cf9d63afd292e78e48821d07dae3081416679a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Oct 2025 03:06:33 +0000 Subject: [PATCH 1/6] Bump otelInstrumentationAlphaVersion from 2.19.0-alpha to 2.21.0-alpha Bumps `otelInstrumentationAlphaVersion` from 2.19.0-alpha to 2.21.0-alpha. Updates `io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha` from 2.19.0-alpha to 2.21.0-alpha - [Release notes](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java-instrumentation/commits) Updates `io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator` from 2.19.0-alpha to 2.21.0-alpha - [Release notes](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java-instrumentation/commits) Updates `io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api` from 2.19.0-alpha to 2.21.0-alpha - [Release notes](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java-instrumentation/commits) Updates `io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap` from 2.19.0-alpha to 2.21.0-alpha - [Release notes](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java-instrumentation/commits) Updates `io.opentelemetry.javaagent:opentelemetry-javaagent-tooling` from 2.19.0-alpha to 2.21.0-alpha - [Release notes](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases) - [Changelog](https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/main/CHANGELOG.md) - [Commits](https://github.com/open-telemetry/opentelemetry-java-instrumentation/commits) --- updated-dependencies: - dependency-name: io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha dependency-version: 2.21.0-alpha dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator dependency-version: 2.21.0-alpha dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api dependency-version: 2.21.0-alpha dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap dependency-version: 2.21.0-alpha dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry.javaagent:opentelemetry-javaagent-tooling dependency-version: 2.21.0-alpha dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- dependencyManagement/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 5d16e14d63d..312ebde424b 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -8,7 +8,7 @@ val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions val otelSdkVersion = "1.53.0" -val otelInstrumentationAlphaVersion = "2.19.0-alpha" +val otelInstrumentationAlphaVersion = "2.21.0-alpha" val otelInstrumentationVersion = "2.19.0" val otelContribVersion = "1.48.0" From 3030782542cce80c4fc32e46e26662ba9c4bc05a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 Oct 2025 03:07:44 +0000 Subject: [PATCH 2/6] ./gradlew generateLicenseReport --- licenses/more-licenses.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 9b60d19e27b..6d9d7256941 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ # agent ## Dependency License Report -_2025-10-09 21:30:57 UTC_ +_2025-10-20 03:07:38 UTC_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.20` @@ -170,43 +170,43 @@ _2025-10-09 21:30:57 UTC_ > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**32** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.53.0` +**32** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.55.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**33** **Group:** `io.opentelemetry` **Name:** `opentelemetry-common` **Version:** `1.53.0` +**33** **Group:** `io.opentelemetry` **Name:** `opentelemetry-common` **Version:** `1.55.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**34** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.53.0` +**34** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.55.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**35** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.53.0` +**35** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.55.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**36** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.53.0` +**36** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.55.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**37** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure` **Version:** `1.53.0` +**37** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure` **Version:** `1.55.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**38** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.53.0` +**38** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.55.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**39** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.53.0` +**39** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.55.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**40** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.53.0` +**40** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.55.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**41** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.53.0` +**41** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.55.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) From 47dab2b2216bc5c4170488d06a209f429fd61993 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 20 Oct 2025 03:07:49 +0000 Subject: [PATCH 3/6] ./gradlew resolveAndLockAll --write-locks --- agent/agent-bootstrap/gradle.lockfile | 8 +++--- agent/agent-for-testing/gradle.lockfile | 8 +++--- .../gc-monitor-api/gradle.lockfile | 8 +++--- .../gc-monitor-core/gradle.lockfile | 8 +++--- .../gc-monitor-tests/gradle.lockfile | 8 +++--- .../agent-alerting-api/gradle.lockfile | 8 +++--- .../agent-alerting/gradle.lockfile | 8 +++--- .../agent-diagnostics-api/gradle.lockfile | 8 +++--- .../agent-diagnostics-jfr/gradle.lockfile | 8 +++--- .../agent-diagnostics/gradle.lockfile | 8 +++--- agent/agent-tooling/gradle.lockfile | 28 +++++++++---------- agent/agent/gradle.lockfile | 8 +++--- .../gradle.lockfile | 8 +++--- .../gradle.lockfile | 8 +++--- .../azure-functions/gradle.lockfile | 8 +++--- agent/instrumentation/methods/gradle.lockfile | 8 +++--- .../micrometer-1.0/gradle.lockfile | 8 +++--- agent/runtime-attach/gradle.lockfile | 8 +++--- classic-sdk/core/gradle.lockfile | 8 +++--- classic-sdk/web/gradle.lockfile | 8 +++--- etw/java/gradle.lockfile | 8 +++--- 21 files changed, 94 insertions(+), 94 deletions(-) diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/agent/agent-bootstrap/gradle.lockfile +++ b/agent/agent-bootstrap/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/agent/agent-for-testing/gradle.lockfile +++ b/agent/agent-for-testing/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile index 450c90485d2..35e172ee0eb 100644 --- a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath com.google.errorprone:error_prone_annotations:2.42.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile index 450c90485d2..35e172ee0eb 100644 --- a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath com.google.errorprone:error_prone_annotations:2.42.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/agent/agent-profiler/agent-alerting-api/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting-api/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile index a59c4790716..bdabd1986e8 100644 --- a/agent/agent-profiler/agent-alerting/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-json:1.5.0=runtimeClasspath com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics/gradle.lockfile b/agent/agent-profiler/agent-diagnostics/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/agent/agent-profiler/agent-diagnostics/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index 4b51c18055a..6cf34ca57f5 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -52,20 +52,20 @@ io.netty:netty-transport-native-kqueue:4.2.6.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.2.6.Final=runtimeClasspath io.netty:netty-transport:4.2.6.Final=runtimeClasspath io.opentelemetry.contrib:opentelemetry-jfr-connection:1.48.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-api:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-common:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-context:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-common:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-logs:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-metrics:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-trace:1.53.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-api:1.55.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath +io.opentelemetry:opentelemetry-common:1.55.0=runtimeClasspath +io.opentelemetry:opentelemetry-context:1.55.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.55.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.55.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.55.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.55.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.55.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.55.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk:1.55.0=runtimeClasspath io.projectreactor.netty:reactor-netty-core:1.2.9=runtimeClasspath io.projectreactor.netty:reactor-netty-http:1.2.9=runtimeClasspath io.projectreactor:reactor-core:3.7.9=runtimeClasspath diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/agent/agent/gradle.lockfile +++ b/agent/agent/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile +++ b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile +++ b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/agent/instrumentation/azure-functions/gradle.lockfile +++ b/agent/instrumentation/azure-functions/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/agent/instrumentation/methods/gradle.lockfile +++ b/agent/instrumentation/methods/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/agent/instrumentation/micrometer-1.0/gradle.lockfile +++ b/agent/instrumentation/micrometer-1.0/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile index fb15d437c1f..f58bc938c72 100644 --- a/agent/runtime-attach/gradle.lockfile +++ b/agent/runtime-attach/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.48.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath net.bytebuddy:byte-buddy-agent:1.17.6=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/classic-sdk/core/gradle.lockfile +++ b/classic-sdk/core/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile index 2ec59d268b8..f15ab780a14 100644 --- a/classic-sdk/web/gradle.lockfile +++ b/classic-sdk/web/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty= diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index 9ac58df47f1..790b01b2cee 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.19.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.19.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.53.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.53.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath From 598b7ac19f569765f8aad1d7a855dc27e892d87c Mon Sep 17 00:00:00 2001 From: Sean Li Date: Mon, 1 Dec 2025 13:42:03 -0800 Subject: [PATCH 4/6] Sync otel versions and fix build failure --- .../agent/internal/telemetry/BatchItemProcessor.java | 4 ++-- dependencyManagement/build.gradle.kts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java index 38dea466d84..eeea171059d 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java @@ -10,7 +10,7 @@ import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem; import com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryItemExporter; import io.opentelemetry.api.logs.LoggerProvider; -import io.opentelemetry.internal.shaded.jctools.queues.MpscArrayQueue; +import io.opentelemetry.internal.shaded.jctools.queues.atomic.MpscAtomicArrayQueue; import io.opentelemetry.javaagent.bootstrap.CallDepth; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.internal.DaemonThreadFactory; @@ -56,7 +56,7 @@ public static BatchItemProcessorBuilder builder(TelemetryItemExporter exporter) long exporterTimeoutNanos, int maxPendingExports, String queueName) { - MpscArrayQueue queue = new MpscArrayQueue<>(maxQueueSize); + MpscAtomicArrayQueue queue = new MpscAtomicArrayQueue<>(maxQueueSize); this.worker = new Worker( exporter, diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 312ebde424b..f10d8ce4e00 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -7,10 +7,10 @@ data class DependencySet(val group: String, val version: String, val modules: Li val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions -val otelSdkVersion = "1.53.0" +val otelSdkVersion = "1.55.0" val otelInstrumentationAlphaVersion = "2.21.0-alpha" -val otelInstrumentationVersion = "2.19.0" -val otelContribVersion = "1.48.0" +val otelInstrumentationVersion = "2.21.0" +val otelContribVersion = "1.51.0" rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaVersion From b2d1fdd23caedb94ca135ce46a3c43b03cd2a070 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Mon, 1 Dec 2025 13:44:38 -0800 Subject: [PATCH 5/6] ./gradlew cleanLicenses generateLicenseReport --refresh-dependencies --rerun-tasks --no-build-cache --- licenses/more-licenses.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 6d9d7256941..d127ae912b3 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ # agent ## Dependency License Report -_2025-10-20 03:07:38 UTC_ +_2025-12-01 13:40:02 PST_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.20` @@ -210,7 +210,7 @@ _2025-10-20 03:07:38 UTC_ > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**42** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-jfr-connection` **Version:** `1.48.0-alpha` +**42** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-jfr-connection` **Version:** `1.51.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) From dc8e47f6114f1a671e131cc49a7d3f52b9cc942b Mon Sep 17 00:00:00 2001 From: Sean Li Date: Mon, 1 Dec 2025 13:45:28 -0800 Subject: [PATCH 6/6] `./gradlew resolveAndLockAll --write-locks` --- agent/agent-tooling/gradle.lockfile | 2 +- agent/runtime-attach/gradle.lockfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index 6cf34ca57f5..6ed6dece5b5 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -51,7 +51,7 @@ io.netty:netty-transport-native-epoll:4.2.6.Final=runtimeClasspath io.netty:netty-transport-native-kqueue:4.2.6.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.2.6.Final=runtimeClasspath io.netty:netty-transport:4.2.6.Final=runtimeClasspath -io.opentelemetry.contrib:opentelemetry-jfr-connection:1.48.0-alpha=runtimeClasspath +io.opentelemetry.contrib:opentelemetry-jfr-connection:1.51.0-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath io.opentelemetry:opentelemetry-api:1.55.0=runtimeClasspath diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile index f58bc938c72..24d060dc75d 100644 --- a/agent/runtime-attach/gradle.lockfile +++ b/agent/runtime-attach/gradle.lockfile @@ -4,12 +4,12 @@ com.azure:azure-sdk-bom:1.3.0=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.20.0=runtimeClasspath io.netty:netty-bom:4.2.6.Final=runtimeClasspath -io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.48.0-alpha=runtimeClasspath +io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.51.0-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.21.0-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.21.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.55.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.55.0=runtimeClasspath -net.bytebuddy:byte-buddy-agent:1.17.6=runtimeClasspath +net.bytebuddy:byte-buddy-agent:1.17.8=runtimeClasspath org.junit:junit-bom:5.14.0=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.1=runtimeClasspath empty=