From 50b66db24ee4077e6b628a0ad14613a897969b3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2026 03:14:14 +0000 Subject: [PATCH 01/10] Bump otelInstrumentationAlphaVersion from 2.26.1-alpha to 2.27.0-alpha Bumps `otelInstrumentationAlphaVersion` from 2.26.1-alpha to 2.27.0-alpha. Updates `io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha` from 2.26.1-alpha to 2.27.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.26.1-alpha to 2.27.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.26.1-alpha to 2.27.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.26.1-alpha to 2.27.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.26.1-alpha to 2.27.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.27.0-alpha dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator dependency-version: 2.27.0-alpha dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api dependency-version: 2.27.0-alpha dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap dependency-version: 2.27.0-alpha dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: io.opentelemetry.javaagent:opentelemetry-javaagent-tooling dependency-version: 2.27.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 56272839d1..c56941f23f 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.60.1" -val otelInstrumentationAlphaVersion = "2.26.1-alpha" +val otelInstrumentationAlphaVersion = "2.27.0-alpha" val otelInstrumentationVersion = "2.26.1" val otelContribVersion = "1.54.0" From 6e48c0cb508e2fe0e31e2cf8faeefbdf96d1a758 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2026 03:16:08 +0000 Subject: [PATCH 02/10] ./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 df8fd32d26..93400d7d75 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ # agent ## Dependency License Report -_2026-04-06 03:19:59 UTC_ +_2026-04-22 03:16:02 UTC_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.21` @@ -170,43 +170,43 @@ _2026-04-06 03:19:59 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.60.1` +**32** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.61.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.60.1` +**33** **Group:** `io.opentelemetry` **Name:** `opentelemetry-common` **Version:** `1.61.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.60.1` +**34** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.61.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.60.1` +**35** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.61.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.60.1` +**36** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.61.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.60.1` +**37** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure` **Version:** `1.61.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.60.1` +**38** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.61.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.60.1` +**39** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.61.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.60.1` +**40** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.61.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.60.1` +**41** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.61.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 8e3fa4b67773a183f4c57aa95b45fbdcf0022930 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 22 Apr 2026 03:16:11 +0000 Subject: [PATCH 03/10] ./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 8986a571d4..9fdca1165b 100644 --- a/agent/agent-bootstrap/gradle.lockfile +++ b/agent/agent-bootstrap/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile index 8986a571d4..9fdca1165b 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.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=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 0756d02f0a..c7bf5424cf 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.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath com.google.errorprone:error_prone_annotations:2.46.0=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile index 0756d02f0a..c7bf5424cf 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.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath com.google.errorprone:error_prone_annotations:2.46.0=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile index 8986a571d4..9fdca1165b 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.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile index 8986a571d4..9fdca1165b 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.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile index 038c1b2ac6..32a22149a4 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.1=runtimeClasspath com.azure:azure-sdk-bom:1.3.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile index 8986a571d4..9fdca1165b 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.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile index 8986a571d4..9fdca1165b 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.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics/gradle.lockfile b/agent/agent-profiler/agent-diagnostics/gradle.lockfile index 8986a571d4..9fdca1165b 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.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index d6d12f4ed8..d9326d37f4 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.12.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.2.12.Final=runtimeClasspath io.netty:netty-transport:4.2.12.Final=runtimeClasspath io.opentelemetry.contrib:opentelemetry-jfr-connection:1.54.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-api:1.60.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath -io.opentelemetry:opentelemetry-common:1.60.1=runtimeClasspath -io.opentelemetry:opentelemetry-context:1.60.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-common:1.60.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.60.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.60.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-logs:1.60.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-metrics:1.60.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-trace:1.60.1=runtimeClasspath -io.opentelemetry:opentelemetry-sdk:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-api:1.61.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath +io.opentelemetry:opentelemetry-common:1.61.0=runtimeClasspath +io.opentelemetry:opentelemetry-context:1.61.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.61.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.61.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.61.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.61.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.61.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.61.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk:1.61.0=runtimeClasspath io.projectreactor.netty:reactor-netty-core:1.2.13=runtimeClasspath io.projectreactor.netty:reactor-netty-http:1.2.13=runtimeClasspath io.projectreactor:reactor-core:3.7.14=runtimeClasspath diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile index 8986a571d4..9fdca1165b 100644 --- a/agent/agent/gradle.lockfile +++ b/agent/agent/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile index 8986a571d4..9fdca1165b 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.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile index 8986a571d4..9fdca1165b 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.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile index 8986a571d4..9fdca1165b 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.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile index 8986a571d4..9fdca1165b 100644 --- a/agent/instrumentation/methods/gradle.lockfile +++ b/agent/instrumentation/methods/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile index 8986a571d4..9fdca1165b 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.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile index 05612e5382..36c31badc9 100644 --- a/agent/runtime-attach/gradle.lockfile +++ b/agent/runtime-attach/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.54.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath net.bytebuddy:byte-buddy-agent:1.18.5=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile index 8986a571d4..9fdca1165b 100644 --- a/classic-sdk/core/gradle.lockfile +++ b/classic-sdk/core/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile index 8986a571d4..9fdca1165b 100644 --- a/classic-sdk/web/gradle.lockfile +++ b/classic-sdk/web/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index 9fe85d0db3..4702e1ce55 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath From 6ad766cd768a0af724aae09445a988198794e551 Mon Sep 17 00:00:00 2001 From: Sean Li Date: Wed, 20 May 2026 17:58:27 -0700 Subject: [PATCH 04/10] Sync OTel versions with upstream --- buildSrc/build.gradle.kts | 2 +- dependencyManagement/build.gradle.kts | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 4bd708d4c9..c19ed7ce55 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { implementation("org.owasp:dependency-check-gradle:12.2.1") - implementation("io.opentelemetry.instrumentation:gradle-plugins:2.26.1-alpha") + implementation("io.opentelemetry.instrumentation:gradle-plugins:2.27.0-alpha") implementation("net.ltgt.gradle:gradle-errorprone-plugin:5.1.0") implementation("net.ltgt.gradle:gradle-nullaway-plugin:3.0.0") diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index c56941f23f..af02161348 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.60.1" +val otelSdkVersion = "1.61.0" val otelInstrumentationAlphaVersion = "2.27.0-alpha" -val otelInstrumentationVersion = "2.26.1" -val otelContribVersion = "1.54.0" +val otelInstrumentationVersion = "2.27.0" +val otelContribVersion = "1.56.0" rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaVersion From 485a75e832bac4977cf463daa8cf9a7b867f6a52 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 May 2026 01:02:14 +0000 Subject: [PATCH 05/10] ./gradlew generateLicenseReport --- 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 93400d7d75..62d2a700ed 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ # agent ## Dependency License Report -_2026-04-22 03:16:02 UTC_ +_2026-05-21 01:02:10 UTC_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.21` @@ -210,7 +210,7 @@ _2026-04-22 03:16:02 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.54.0-alpha` +**42** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-jfr-connection` **Version:** `1.56.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 d18492d7dbc143289057a5b5d2a9fed2bd511ce8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 21 May 2026 01:02:18 +0000 Subject: [PATCH 06/10] ./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 d9326d37f4..9e9614fe55 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.12.Final=runtimeClasspath io.netty:netty-transport-native-kqueue:4.2.12.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.2.12.Final=runtimeClasspath io.netty:netty-transport:4.2.12.Final=runtimeClasspath -io.opentelemetry.contrib:opentelemetry-jfr-connection:1.54.0-alpha=runtimeClasspath +io.opentelemetry.contrib:opentelemetry-jfr-connection:1.56.0-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath io.opentelemetry:opentelemetry-api:1.61.0=runtimeClasspath diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile index 36c31badc9..128cc4a3b5 100644 --- a/agent/runtime-attach/gradle.lockfile +++ b/agent/runtime-attach/gradle.lockfile @@ -4,12 +4,12 @@ com.azure:azure-sdk-bom:1.3.5=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.54.0-alpha=runtimeClasspath +io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.56.0-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.5=runtimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.8=runtimeClasspath org.junit:junit-bom:5.14.3=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.4=runtimeClasspath empty= From 539792d95d75dc85f4b2a255e46d5e2e39f0267c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 21 May 2026 01:11:40 +0000 Subject: [PATCH 07/10] chore: initialize plan for merge conflict resolution Agent-Logs-Url: https://github.com/microsoft/ApplicationInsights-Java/sessions/14d56339-36a8-4724-84af-a8dafd28e687 Co-authored-by: xiang17 <9310587+xiang17@users.noreply.github.com> --- gradlew.bat | 186 ++++++++++++++++++++--------------------- perf-tests/gradlew.bat | 186 ++++++++++++++++++++--------------------- 2 files changed, 186 insertions(+), 186 deletions(-) diff --git a/gradlew.bat b/gradlew.bat index e509b2dd8f..c4bdd3ab8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,93 +1,93 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/perf-tests/gradlew.bat b/perf-tests/gradlew.bat index e509b2dd8f..c4bdd3ab8e 100755 --- a/perf-tests/gradlew.bat +++ b/perf-tests/gradlew.bat @@ -1,93 +1,93 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 5bda218d56e1302c9f4ab0305288548628e3a415 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" Date: Thu, 21 May 2026 01:53:28 +0000 Subject: [PATCH 08/10] ./gradlew resolveAndLockAll --write-locks && generateLicenseReport Co-authored-by: xiang17 <9310587+xiang17@users.noreply.github.com> --- 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/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 | 12 +++++----- classic-sdk/core/gradle.lockfile | 8 +++---- classic-sdk/web/gradle.lockfile | 8 +++---- etw/java/gradle.lockfile | 8 +++---- licenses/more-licenses.md | 24 +++++++++---------- 21 files changed, 94 insertions(+), 94 deletions(-) diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index 256e68e5e0..12350ec77d 100644 --- a/agent/agent-bootstrap/gradle.lockfile +++ b/agent/agent-bootstrap/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile index 256e68e5e0..12350ec77d 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.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=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 3267330fd3..81d2f508ef 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.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath com.google.errorprone:error_prone_annotations:2.49.0=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile index 3267330fd3..81d2f508ef 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.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath com.google.errorprone:error_prone_annotations:2.49.0=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile index 256e68e5e0..12350ec77d 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.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile index 256e68e5e0..12350ec77d 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.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile index 6c30ed34e1..104b72aaa9 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.1=runtimeClasspath com.azure:azure-sdk-bom:1.3.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile index 256e68e5e0..12350ec77d 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.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile index 256e68e5e0..12350ec77d 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.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics/gradle.lockfile b/agent/agent-profiler/agent-diagnostics/gradle.lockfile index 256e68e5e0..12350ec77d 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.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile index 256e68e5e0..12350ec77d 100644 --- a/agent/agent/gradle.lockfile +++ b/agent/agent/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile index 256e68e5e0..12350ec77d 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.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile index 256e68e5e0..12350ec77d 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.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile index 256e68e5e0..12350ec77d 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.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile index 256e68e5e0..12350ec77d 100644 --- a/agent/instrumentation/methods/gradle.lockfile +++ b/agent/instrumentation/methods/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile index 256e68e5e0..12350ec77d 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.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile index 33609983d3..ef668eb860 100644 --- a/agent/runtime-attach/gradle.lockfile +++ b/agent/runtime-attach/gradle.lockfile @@ -4,12 +4,12 @@ com.azure:azure-sdk-bom:1.3.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.54.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.5=runtimeClasspath +io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.56.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.8=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile index 256e68e5e0..12350ec77d 100644 --- a/classic-sdk/core/gradle.lockfile +++ b/classic-sdk/core/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile index 256e68e5e0..12350ec77d 100644 --- a/classic-sdk/web/gradle.lockfile +++ b/classic-sdk/web/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index 9cd5c78d80..da70734403 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.3.6=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.21.2=runtimeClasspath io.netty:netty-bom:4.2.12.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.26.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.26.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.60.1-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.60.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.27.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.27.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.61.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.61.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.slf4j:slf4j-api:2.0.17=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 2ffd3a765c..77fb4a287f 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ # agent ## Dependency License Report -_2026-04-29 02:29:20 UTC_ +_2026-05-21 01:53:07 UTC_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.21` @@ -170,47 +170,47 @@ _2026-04-29 02:29:20 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.60.1` +**32** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.61.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.60.1` +**33** **Group:** `io.opentelemetry` **Name:** `opentelemetry-common` **Version:** `1.61.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.60.1` +**34** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.61.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.60.1` +**35** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.61.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.60.1` +**36** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.61.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.60.1` +**37** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure` **Version:** `1.61.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.60.1` +**38** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.61.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.60.1` +**39** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.61.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.60.1` +**40** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.61.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.60.1` +**41** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.61.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) -**42** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-jfr-connection` **Version:** `1.54.0-alpha` +**42** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-jfr-connection` **Version:** `1.56.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 2ea5592216e1c62954cf31d527127d798bade71c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Thu, 21 May 2026 01:53:46 +0000 Subject: [PATCH 09/10] Regenerate lockfiles and license report with merged upgrades Agent-Logs-Url: https://github.com/microsoft/ApplicationInsights-Java/sessions/9dc4c4b5-19b7-4a8b-aa60-1269d01601fa Co-authored-by: xiang17 <9310587+xiang17@users.noreply.github.com> --- gradlew.bat | 186 ++++++++++++++++++++--------------------- perf-tests/gradlew.bat | 186 ++++++++++++++++++++--------------------- 2 files changed, 186 insertions(+), 186 deletions(-) diff --git a/gradlew.bat b/gradlew.bat index e509b2dd8f..c4bdd3ab8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,93 +1,93 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/perf-tests/gradlew.bat b/perf-tests/gradlew.bat index e509b2dd8f..c4bdd3ab8e 100755 --- a/perf-tests/gradlew.bat +++ b/perf-tests/gradlew.bat @@ -1,93 +1,93 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega From 50f03e8f415ad8de673f828e24a73c0a543d655f Mon Sep 17 00:00:00 2001 From: Sean Li Date: Thu, 21 May 2026 11:18:32 -0700 Subject: [PATCH 10/10] Revert unnecessary gradlew.bat line ending changes --- gradlew.bat | 186 ++++++++++++++++++++--------------------- perf-tests/gradlew.bat | 186 ++++++++++++++++++++--------------------- 2 files changed, 186 insertions(+), 186 deletions(-) diff --git a/gradlew.bat b/gradlew.bat index c4bdd3ab8e..e509b2dd8f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,93 +1,93 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/perf-tests/gradlew.bat b/perf-tests/gradlew.bat index c4bdd3ab8e..e509b2dd8f 100755 --- a/perf-tests/gradlew.bat +++ b/perf-tests/gradlew.bat @@ -1,93 +1,93 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem -@rem SPDX-License-Identifier: Apache-2.0 -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -echo. 1>&2 -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 -echo. 1>&2 -echo Please set the JAVA_HOME variable in your environment to match the 1>&2 -echo location of your Java installation. 1>&2 - -goto fail - -:execute -@rem Setup the command line - - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega