diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index 68f0205c624..9111ae4644d 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 8dd2150752a..1f444a9f8d8 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 fc4418a4c57..37cb2ed7433 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.17.0=runtimeClasspath com.google.guava:guava-bom:31.1-jre=runtimeClasspath io.netty:netty-bom:4.1.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 fc4418a4c57..37cb2ed7433 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.17.0=runtimeClasspath com.google.guava:guava-bom:31.1-jre=runtimeClasspath io.netty:netty-bom:4.1.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 8dd2150752a..1f444a9f8d8 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 8dd2150752a..1f444a9f8d8 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 5448f2ed187..eabe733f99c 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 8dd2150752a..1f444a9f8d8 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 6ea85069684..f18163c0129 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.87.Final=runtimeClasspath io.netty:netty-transport-native-kqueue:4.1.87.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.1.87.Final=runtimeClasspath io.netty:netty-transport:4.1.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath io.projectreactor.netty:reactor-netty-core:1.1.2=runtimeClasspath io.projectreactor.netty:reactor-netty-http:1.1.2=runtimeClasspath io.projectreactor:reactor-core:3.5.2=runtimeClasspath diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/LoggingLevelConfigurator.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/LoggingLevelConfigurator.java index 7fdf56756f9..25eeec43c72 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/LoggingLevelConfigurator.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/init/LoggingLevelConfigurator.java @@ -73,10 +73,6 @@ public void updateLoggerLevel(Logger logger) { // OpenTelemetry instrumentation debug log has lots of things that look like errors // which has been confusing customers, so only enable it when user configures "trace" level loggerLevel = getDefaultLibraryLevel(level); - } else if (name.startsWith("muzzleMatcher")) { - // muzzleMatcher logs at WARN level, so by default this is OFF, but enabled when DEBUG logging - // is enabled - loggerLevel = getMuzzleMatcherLevel(level); } else if (name.equals("com.azure.core.implementation.jackson.MemberNameConverterImpl")) { // never want to log at trace or debug, as it logs confusing stack trace that // looks like error but isn't @@ -149,14 +145,6 @@ private static Level getOtherLibLevel(Level level) { return level == Level.INFO ? Level.WARN : level; } - // TODO need something more reliable, currently will log too much WARN if "muzzleMatcher" logger - // name changes - // muzzleMatcher logs at WARN level in order to make them visible, but really should only be - // enabled when debugging - private static Level getMuzzleMatcherLevel(Level level) { - return level.toInt() <= Level.DEBUG.toInt() ? level : getMaxLevel(level, Level.ERROR); - } - private static Level getMaxLevel(Level level1, Level level2) { return level1.toInt() >= level2.toInt() ? level1 : level2; } diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile index 8dd2150752a..1f444a9f8d8 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 326d0ca1e24..37326b36e9b 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.87.Final=runtimeClasspath io.netty:netty-transport-native-kqueue:4.1.87.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.1.87.Final=runtimeClasspath io.netty:netty-transport:4.1.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath io.projectreactor.netty:reactor-netty-core:1.1.2=runtimeClasspath io.projectreactor.netty:reactor-netty-http:1.1.2=runtimeClasspath io.projectreactor:reactor-core:3.5.2=runtimeClasspath diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile index 8dd2150752a..1f444a9f8d8 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 8dd2150752a..1f444a9f8d8 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 8dd2150752a..1f444a9f8d8 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 8dd2150752a..1f444a9f8d8 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 8dd2150752a..1f444a9f8d8 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 46b0c1c45a3..bfd30fc8db9 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.87.Final=runtimeClasspath io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.18.0-alpha=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath net.bytebuddy:byte-buddy-agent:1.11.18=runtimeClasspath org.junit:junit-bom:5.9.2=runtimeClasspath org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index fa8892aabbc..fc017beb0d2 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -33,7 +33,7 @@ dependencies { implementation("org.owasp:dependency-check-gradle:7.4.4") - implementation("io.opentelemetry.instrumentation:gradle-plugins:1.21.0-alpha") + implementation("io.opentelemetry.instrumentation:gradle-plugins:1.22.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 8dd2150752a..1f444a9f8d8 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=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 8dd2150752a..1f444a9f8d8 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=runtimeClasspath org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath empty= diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 2e4bdc2196e..908da46b5b7 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.21.0" -val otelInstrumentationVersion = "1.21.0" -val otelInstrumentationAlphaVersion = "1.21.0-alpha" +val otelVersion = "1.22.0" +val otelInstrumentationVersion = "1.22.0" +val otelInstrumentationAlphaVersion = "1.22.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 5448f2ed187..eabe733f99c 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.87.Final=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.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:1.22.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.22.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.22.0=runtimeClasspath org.junit:junit-bom:5.9.2=runtimeClasspath org.slf4j:slf4j-api:1.7.36=runtimeClasspath org.testcontainers:testcontainers-bom:1.17.6=runtimeClasspath diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 13c87e9253d..6757793f74d 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ #agent ##Dependency License Report -_2023-01-12 16:50:44 PST_ +_2023-01-13 09:50:50 PST_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.14.1`