diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index f31d258446..db83106931 100644 --- a/agent/agent-bootstrap/gradle.lockfile +++ b/agent/agent-bootstrap/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile index ba28ad8f77..ddf72bbcc8 100644 --- a/agent/agent-for-testing/gradle.lockfile +++ b/agent/agent-for-testing/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile index 2c59f64f75..1740cc9f6f 100644 --- a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile @@ -6,8 +6,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath com.google.errorprone:error_prone_annotations:2.50.0=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.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 812193ed1f..98eb7713de 100644 --- a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile @@ -6,8 +6,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath com.google.errorprone:error_prone_annotations:2.50.0=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.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 3d7c10d440..2565517b47 100644 --- a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile index 4122b3e3ec..e1d217c4fe 100644 --- a/agent/agent-profiler/agent-alerting-api/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting-api/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile index 126cc7ba3e..34459cc489 100644 --- a/agent/agent-profiler/agent-alerting/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting/gradle.lockfile @@ -6,8 +6,8 @@ com.azure:azure-json:1.5.1=runtimeClasspath com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile index 85addba68d..5be1854b74 100644 --- a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile index 1be0535e77..31c2e9f5e1 100644 --- a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/agent/agent-profiler/agent-diagnostics/gradle.lockfile b/agent/agent-profiler/agent-diagnostics/gradle.lockfile index f0af3da783..f8618daf94 100644 --- a/agent/agent-profiler/agent-diagnostics/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index 2e3de559df..58ff9cc5a3 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -53,9 +53,9 @@ io.netty:netty-transport-native-epoll:4.2.19.Final=runtimeClasspath io.netty:netty-transport-native-kqueue:4.2.19.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.2.19.Final=runtimeClasspath io.netty:netty-transport:4.2.19.Final=runtimeClasspath -io.opentelemetry.contrib:opentelemetry-jfr-connection:1.60.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.contrib:opentelemetry-jfr-connection:1.61.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-api:1.66.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile index ce8f83cf13..0218ec5ca4 100644 --- a/agent/agent/gradle.lockfile +++ b/agent/agent/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile index e423664ced..b8fa6fe83d 100644 --- a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile +++ b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile index f4219b4b09..eebb00deba 100644 --- a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile +++ b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile index c42464a83d..a94d57fcb8 100644 --- a/agent/instrumentation/azure-functions/gradle.lockfile +++ b/agent/instrumentation/azure-functions/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile index 89ea6fa741..b904f463f4 100644 --- a/agent/instrumentation/methods/gradle.lockfile +++ b/agent/instrumentation/methods/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile index bbff966bb8..98b155ea3f 100644 --- a/agent/instrumentation/micrometer-1.0/gradle.lockfile +++ b/agent/instrumentation/micrometer-1.0/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile index ec613c8428..2d3fe8270a 100644 --- a/agent/runtime-attach/gradle.lockfile +++ b/agent/runtime-attach/gradle.lockfile @@ -5,12 +5,12 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.60.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.61.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.12=runtimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.14=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 0fd94177a6..c69a657af2 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { implementation("org.owasp:dependency-check-gradle:13.0.0") - implementation("io.opentelemetry.instrumentation:gradle-plugins:2.31.1-alpha") + implementation("io.opentelemetry.instrumentation:gradle-plugins:2.32.0-alpha") implementation("net.ltgt.gradle:gradle-errorprone-plugin:5.1.1") implementation("net.ltgt.gradle:gradle-nullaway-plugin:3.3.0") diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile index c35e27fd07..18694da962 100644 --- a/classic-sdk/core/gradle.lockfile +++ b/classic-sdk/core/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile index 91a6b8fdb5..9f56a9954f 100644 --- a/classic-sdk/web/gradle.lockfile +++ b/classic-sdk/web/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 73fdd4c3e8..e164d38e62 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -9,10 +9,10 @@ rootProject.extra["versions"] = dependencyVersions val otelSdkVersion = "1.66.0" val otelSdkAlphaVersion = "1.66.0-alpha" -val otelInstrumentationAlphaVersion = "2.31.1-alpha" -val otelInstrumentationVersion = "2.31.1" +val otelInstrumentationAlphaVersion = "2.32.0-alpha" +val otelInstrumentationVersion = "2.32.0" val otelContribVersion = "1.56.0" -val otelContribAlphaVersion = "1.60.0-alpha" +val otelContribAlphaVersion = "1.61.0-alpha" rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaVersion diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index eeaf64996c..fea2fdb19d 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -5,8 +5,8 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.3=runtimeClasspath io.netty:netty-bom:4.2.19.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.31.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.32.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.32.0=runtimeClasspath io.opentelemetry:opentelemetry-bom-alpha:1.66.0-alpha=runtimeClasspath io.opentelemetry:opentelemetry-bom:1.66.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 2cd6d52678..f39e520a9c 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -209,7 +209,7 @@ > - **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.60.0-alpha` +**42** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-jfr-connection` **Version:** `1.61.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) diff --git a/smoke-tests/apps/VerifyAgentJar/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java b/smoke-tests/apps/VerifyAgentJar/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java index 93f76e2cdc..c0019a36de 100644 --- a/smoke-tests/apps/VerifyAgentJar/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java +++ b/smoke-tests/apps/VerifyAgentJar/src/main/java/com/microsoft/applicationinsights/smoketestapp/TestController.java @@ -19,13 +19,16 @@ public class TestController { private static final File AGENT_JAR = getAgentJarFile(); - private static final long ONE_MEGABYTE = 1024 * 1024; - // size of the unsigned agent jar built by CI (released jars are ~3mb larger due to code signing) - // measured on 3.7.10-SNAPSHOT (otel instrumentation 2.31.1, oshi 7.7.0) - // growth since the previous baseline (43798057, set in 3.6.2) is mostly from upstream otel - // instrumentation and protobuf, which upstream started bundling in 2.28 - private static final long CURRENT_AGENT_JAR_SIZE = 44848880; + // measured on 3.7.10-SNAPSHOT (otel instrumentation 2.32.0) + // most growth comes from upstream otel instrumentation, which typically adds 0-450kb per release + // with occasional larger jumps (e.g. 2.20.1 started bundling protobuf, 2.32.0 expanded database + // semconv instrumentation) + private static final long CURRENT_AGENT_JAR_SIZE = 46031493; + + // large enough to absorb a few months of normal upstream growth, small enough to catch + // unexpected multi-megabyte jumps (e.g. a shading mistake or an unintentionally bundled library) + private static final long ALLOWED_GROWTH_BYTES = 2 * 1024 * 1024; @GetMapping("/") public String root() { @@ -52,8 +55,18 @@ public String verifyAgentJarEntries() throws IOException { @GetMapping("/verifyAgentJarSize") public String verifyAgentJarSize() throws IOException { long size = Files.size(AGENT_JAR.toPath()); - if (size - CURRENT_AGENT_JAR_SIZE >= ONE_MEGABYTE) { - throw new AssertionError("Agent jar size" + size + " has exceeded more than 1 Megabyte."); + long growth = size - CURRENT_AGENT_JAR_SIZE; + if (growth >= ALLOWED_GROWTH_BYTES) { + throw new AssertionError( + "Agent jar size " + + size + + " has grown by " + + growth + + " bytes over the baseline " + + CURRENT_AGENT_JAR_SIZE + + ", which is more than the allowed " + + ALLOWED_GROWTH_BYTES + + " bytes."); } return "OK"; }