Merge remote-tracking branch 'origin/main' into update-otel

trask · trask · commit f21c65ab4e25 · 2025-03-10T13:17:07.000-07:00
diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
@@ -11,5 +11,5 @@ io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
 org.slf4j:slf4j-api:2.0.17=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
@@ -11,5 +11,5 @@ io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
 org.slf4j:slf4j-api:2.0.17=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile
@@ -11,5 +11,5 @@ io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
 org.slf4j:slf4j-api:2.0.17=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-diagnostics/gradle.lockfile b/agent/agent-profiler/agent-diagnostics/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/agent-tooling/build.gradle.kts b/agent/agent-tooling/build.gradle.kts
@@ -21,7 +21,7 @@ dependencies {
   implementation(project(":agent:agent-profiler:agent-diagnostics"))
   implementation(project(":etw:java"))
 
-  implementation("com.azure:azure-monitor-opentelemetry-autoconfigure:1.0.0-beta.3")
+  implementation("com.azure:azure-monitor-opentelemetry-autoconfigure:1.0.0")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-bootstrap")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling")
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling-java9")
diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile
@@ -9,7 +9,7 @@ com.azure:azure-core-http-netty:1.15.10=runtimeClasspath
 com.azure:azure-core:1.55.2=runtimeClasspath
 com.azure:azure-identity:1.15.3=runtimeClasspath
 com.azure:azure-json:1.4.0=runtimeClasspath
-com.azure:azure-monitor-opentelemetry-autoconfigure:1.0.0-beta.3=runtimeClasspath
+com.azure:azure-monitor-opentelemetry-autoconfigure:1.0.0=runtimeClasspath
 com.azure:azure-sdk-bom:1.2.32=runtimeClasspath
 com.azure:azure-storage-blob:12.29.1=runtimeClasspath
 com.azure:azure-storage-common:12.28.1=runtimeClasspath
@@ -81,5 +81,5 @@ org.junit:junit-bom:5.12.0=runtimeClasspath
 org.reactivestreams:reactive-streams:1.0.4=runtimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.17=runtimeClasspath
 org.slf4j:slf4j-api:2.0.17=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile
@@ -11,5 +11,5 @@ io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 net.bytebuddy:byte-buddy-agent:1.15.11=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -28,12 +28,12 @@ dependencies {
 
   // When updating, update above in plugins too
   implementation("com.diffplug.spotless:spotless-plugin-gradle:7.0.2")
-  implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.6")
+  implementation("com.github.spotbugs.snom:spotbugs-gradle-plugin:6.1.7")
   implementation("com.gradleup.shadow:shadow-gradle-plugin:8.3.6")
 
   implementation("org.owasp:dependency-check-gradle:12.1.0")
 
-  implementation("io.opentelemetry.instrumentation:gradle-plugins:2.13.2-alpha")
+  implementation("io.opentelemetry.instrumentation:gradle-plugins:2.13.3-alpha")
 
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:4.1.0")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:2.2.0")
diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile
@@ -9,5 +9,5 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.13.3=runtim
 io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -28,7 +28,7 @@ val DEPENDENCY_BOMS = listOf(
   "com.azure:azure-sdk-bom:1.2.32",
   "io.netty:netty-bom:4.1.119.Final",
   "org.junit:junit-bom:5.12.0",
-  "org.testcontainers:testcontainers-bom:1.20.5",
+  "org.testcontainers:testcontainers-bom:1.20.6",
 )
 
 val autoServiceVersion = "1.1.1"
@@ -75,7 +75,7 @@ val DEPENDENCIES = listOf(
   "io.opentelemetry.contrib:opentelemetry-jfr-connection:${otelContribVersion}-alpha",
   "io.opentelemetry.contrib:opentelemetry-runtime-attach-core:${otelContribVersion}-alpha",
   "com.google.code.findbugs:jsr305:3.0.2",
-  "com.github.spotbugs:spotbugs-annotations:4.9.1"
+  "com.github.spotbugs:spotbugs-annotations:4.9.2"
 )
 
 javaPlatform {
diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile
@@ -10,5 +10,5 @@ io.opentelemetry:opentelemetry-bom-alpha:1.47.0-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.47.0=runtimeClasspath
 org.junit:junit-bom:5.12.0=runtimeClasspath
 org.slf4j:slf4j-api:2.0.17=runtimeClasspath
-org.testcontainers:testcontainers-bom:1.20.5=runtimeClasspath
+org.testcontainers:testcontainers-bom:1.20.6=runtimeClasspath
 empty=
diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md
@@ -1,7 +1,7 @@
 
 # agent
 ## Dependency License Report
-_2025-03-10 10:33:41 PDT_
+_2025-03-10 13:16:35 PDT_
 ## Apache License, Version 2.0
 
 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.18.2` 
@@ -358,7 +358,7 @@ _2025-03-10 10:33:41 PDT_
 > - **POM Project URL**: [https://github.com/Azure/azure-sdk-for-java](https://github.com/Azure/azure-sdk-for-java)
 > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
 
-**69** **Group:** `com.azure` **Name:** `azure-monitor-opentelemetry-autoconfigure` **Version:** `1.0.0-beta.3` 
+**69** **Group:** `com.azure` **Name:** `azure-monitor-opentelemetry-autoconfigure` **Version:** `1.0.0` 
 > - **POM License**: MIT License - [https://opensource.org/licenses/MIT](https://opensource.org/licenses/MIT)
 
 **70** **Group:** `com.azure` **Name:** `azure-storage-blob` **Version:** `12.29.1` 
diff --git a/smoke-tests/framework/build.gradle.kts b/smoke-tests/framework/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
   implementation("io.opentelemetry.proto:opentelemetry-proto:1.5.0-alpha")
 
   // this is exposed in SmokeTestExtension API
-  api("org.testcontainers:testcontainers:1.20.5")
+  api("org.testcontainers:testcontainers:1.20.6")
 
   implementation("org.awaitility:awaitility:4.3.0")
 
