Update to OpenTelemetry 1.21.0 (#2796)

trask · web-flow · commit f4ee0042f94d · 2022-12-14T07:53:47.000-08:00
diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile
@@ -11,10 +11,10 @@ com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 com.squareup.moshi:moshi:1.11.0=runtimeClasspath
 com.squareup.okio:okio:1.17.5=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.slf4j:slf4j-api:1.7.36=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.8=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.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
@@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.errorprone:error_prone_annotations:2.16=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.slf4j:slf4j-api:1.7.36=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile
@@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.errorprone:error_prone_annotations:2.16=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.slf4j:slf4j-api:1.7.36=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.8=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.8=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.8=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.slf4j:slf4j-api:1.7.36=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.8=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile
@@ -50,10 +50,10 @@ io.netty:netty-transport-native-epoll:4.1.86.Final=runtimeClasspath
 io.netty:netty-transport-native-kqueue:4.1.86.Final=runtimeClasspath
 io.netty:netty-transport-native-unix-common:4.1.86.Final=runtimeClasspath
 io.netty:netty-transport:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 io.projectreactor.netty:reactor-netty-core:1.1.0=runtimeClasspath
 io.projectreactor.netty:reactor-netty-http:1.1.0=runtimeClasspath
 io.projectreactor:reactor-core:3.5.0=runtimeClasspath
diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.8=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/agent/azure-monitor-exporter/gradle.lockfile b/agent/azure-monitor-exporter/gradle.lockfile
@@ -40,10 +40,10 @@ io.netty:netty-transport-native-epoll:4.1.86.Final=runtimeClasspath
 io.netty:netty-transport-native-kqueue:4.1.86.Final=runtimeClasspath
 io.netty:netty-transport-native-unix-common:4.1.86.Final=runtimeClasspath
 io.netty:netty-transport:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 io.projectreactor.netty:reactor-netty-core:1.1.0=runtimeClasspath
 io.projectreactor.netty:reactor-netty-http:1.1.0=runtimeClasspath
 io.projectreactor:reactor-core:3.5.0=runtimeClasspath
diff --git a/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/LogDataMapper.java b/agent/azure-monitor-exporter/src/main/java/com/azure/monitor/opentelemetry/exporter/implementation/LogDataMapper.java
@@ -32,6 +32,8 @@ public class LogDataMapper {
   private static final String LOGBACK_MDC_PREFIX = "logback.mdc.";
   private static final String JBOSS_LOGGING_MDC_PREFIX = "jboss-logmanager.mdc.";
 
+  private static final String LOG4J_MAP_MESSAGE_PREFIX = "log4j.map_message."; // log4j 2.x
+
   private static final AttributeKey<String> LOG4J_MARKER = stringKey("log4j.marker");
   private static final AttributeKey<String> LOGBACK_MARKER = stringKey("logback.marker");
 
@@ -64,6 +66,12 @@ public class LogDataMapper {
                   telemetryBuilder.addProperty(
                       key.substring(JBOSS_LOGGING_MDC_PREFIX.length()), String.valueOf(value));
                 })
+            .prefix(
+                LOG4J_MAP_MESSAGE_PREFIX,
+                (telemetryBuilder, key, value) -> {
+                  telemetryBuilder.addProperty(
+                      key.substring(LOG4J_MAP_MESSAGE_PREFIX.length()), String.valueOf(value));
+                })
             .exactString(SemanticAttributes.CODE_FILEPATH, "FileName")
             .exactString(SemanticAttributes.CODE_NAMESPACE, "ClassName")
             .exactString(SemanticAttributes.CODE_FUNCTION, "MethodName")
diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.8=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.8=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.8=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.8=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.8=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile
@@ -6,10 +6,10 @@ com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
 io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.18.0-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 net.bytebuddy:byte-buddy-agent:1.11.18=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
 
   implementation("org.owasp:dependency-check-gradle:7.4.1")
 
-  implementation("io.opentelemetry.instrumentation:gradle-plugins:1.20.2-alpha")
+  implementation("io.opentelemetry.instrumentation:gradle-plugins:1.21.0-alpha")
 
   implementation("net.ltgt.gradle:gradle-errorprone-plugin:3.0.1")
   implementation("net.ltgt.gradle:gradle-nullaway-plugin:1.5.0")
diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile
@@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.8=runtimeClasspath
 com.fasterxml.jackson:jackson-bom:2.14.1=runtimeClasspath
 com.google.guava:guava-bom:31.1-jre=runtimeClasspath
 io.netty:netty-bom:4.1.86.Final=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.20.2-alpha=runtimeClasspath
-io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.20.2=runtimeClasspath
-io.opentelemetry:opentelemetry-bom-alpha:1.20.1-alpha=runtimeClasspath
-io.opentelemetry:opentelemetry-bom:1.20.1=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.21.0=runtimeClasspath
+io.opentelemetry:opentelemetry-bom-alpha:1.21.0-alpha=runtimeClasspath
+io.opentelemetry:opentelemetry-bom:1.21.0=runtimeClasspath
 org.junit:junit-bom:5.9.1=runtimeClasspath
 org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath
 empty=
diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile
