Merge remote-tracking branch 'origin/main' into heya/migrate-profiler-to-azure-json

heyams · heyams · commit cb21e740c1cf · 2024-10-08T11:20:06.000-07:00
diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile
@@ -8,6 +8,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile
@@ -8,6 +8,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile
@@ -8,7 +8,7 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.slf4j:slf4j-api:2.0.16=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
@@ -8,7 +8,7 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.slf4j:slf4j-api:2.0.16=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
@@ -7,6 +7,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile
@@ -7,6 +7,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile
@@ -7,7 +7,7 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.slf4j:slf4j-api:2.0.16=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile
@@ -7,6 +7,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile
@@ -7,6 +7,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-diagnostics/gradle.lockfile b/agent/agent-profiler/agent-diagnostics/gradle.lockfile
@@ -7,6 +7,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile
@@ -78,7 +78,7 @@ net.minidev:accessors-smart:2.5.1=runtimeClasspath
 net.minidev:json-smart:2.5.1=runtimeClasspath
 org.apache.commons:commons-lang3:3.14.0=runtimeClasspath
 org.apache.commons:commons-text:1.12.0=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.reactivestreams:reactive-streams:1.0.4=runtimeClasspath
 org.slf4j:jcl-over-slf4j:2.0.16=runtimeClasspath
 org.slf4j:slf4j-api:2.0.16=runtimeClasspath
diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile
@@ -7,6 +7,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile
@@ -7,6 +7,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile
@@ -7,6 +7,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile
@@ -7,6 +7,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile
@@ -7,6 +7,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile
@@ -7,6 +7,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile
@@ -9,6 +9,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtime
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
 net.bytebuddy:byte-buddy-agent:1.15.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile
@@ -7,6 +7,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile
@@ -7,6 +7,6 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -27,7 +27,7 @@ val DEPENDENCY_BOMS = listOf(
   "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:${otelInstrumentationAlphaVersion}",
   "com.azure:azure-sdk-bom:1.2.28",
   "io.netty:netty-bom:4.1.114.Final",
-  "org.junit:junit-bom:5.11.1",
+  "org.junit:junit-bom:5.11.2",
   "org.testcontainers:testcontainers-bom:1.20.2",
 )
 
diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile
@@ -7,7 +7,7 @@ io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.8.0-a
 io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.8.0=runtimeClasspath
 io.opentelemetry:opentelemetry-bom-alpha:1.42.1-alpha=runtimeClasspath
 io.opentelemetry:opentelemetry-bom:1.42.1=runtimeClasspath
-org.junit:junit-bom:5.11.1=runtimeClasspath
+org.junit:junit-bom:5.11.2=runtimeClasspath
 org.slf4j:slf4j-api:2.0.16=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.20.2=runtimeClasspath
 empty=
