diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index 29b3af6730d..e4de191e9d6 100644 --- 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 index e87c08954b0..68c0e5fd8e9 100644 --- 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 index 6c191850578..445308ea04e 100644 --- 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 index 6c191850578..445308ea04e 100644 --- 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 index e87c08954b0..68c0e5fd8e9 100644 --- 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 index e87c08954b0..68c0e5fd8e9 100644 --- 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 index e2ccec41df9..04d53928392 100644 --- 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 index e87c08954b0..68c0e5fd8e9 100644 --- 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 index ef28c5ce58a..62b068c464d 100644 --- 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 index e87c08954b0..68c0e5fd8e9 100644 --- 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 index 79ec94409cb..d7d9bd14eb3 100644 --- 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 index 57d63c885c0..9cc1de14264 100644 --- 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 LOG4J_MARKER = stringKey("log4j.marker"); private static final AttributeKey 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 index e87c08954b0..68c0e5fd8e9 100644 --- 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 index e87c08954b0..68c0e5fd8e9 100644 --- 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 index e87c08954b0..68c0e5fd8e9 100644 --- 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 index e87c08954b0..68c0e5fd8e9 100644 --- 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 index e87c08954b0..68c0e5fd8e9 100644 --- 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 index 6f3e8de3821..1099f24e77e 100644 --- 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 index 1a45b404138..837e6117a52 100644 --- 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 index e87c08954b0..68c0e5fd8e9 100644 --- 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 index e87c08954b0..68c0e5fd8e9 100644 --- a/classic-sdk/web/gradle.lockfile +++ b/classic-sdk/web/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/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 6a9c385baed..196356693f1 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -11,9 +11,9 @@ data class DependencySet(val group: String, val version: String, val modules: Li val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions -val otelVersion = "1.20.1" -val otelInstrumentationVersion = "1.20.2" -val otelInstrumentationAlphaVersion = "1.20.2-alpha" +val otelVersion = "1.21.0" +val otelInstrumentationVersion = "1.21.0" +val otelInstrumentationAlphaVersion = "1.21.0-alpha" val otelContribAlphaVersion = "1.18.0-alpha" rootProject.extra["otelVersion"] = otelVersion diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index e2ccec41df9..04d53928392 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/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