diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index 7a65d63e63..9e53cf5e26 100644 --- a/agent/agent-bootstrap/gradle.lockfile +++ b/agent/agent-bootstrap/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile index 647e45cc75..3bbd83e489 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.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=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 55a33a4800..03280e7192 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.azure:azure-sdk-bom:1.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath com.google.errorprone:error_prone_annotations:2.49.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.slf4j:slf4j-api:2.0.18=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile index 3640d81435..8ef5da1d85 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.azure:azure-sdk-bom:1.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath com.google.errorprone:error_prone_annotations:2.49.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.slf4j:slf4j-api:2.0.18=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile index 212ce67825..149f72a6c1 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.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile index 59f45f199d..3f228ac3d7 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.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile index 4395715cbd..b518030b99 100644 --- a/agent/agent-profiler/agent-alerting/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting/gradle.lockfile @@ -6,10 +6,10 @@ com.azure:azure-json:1.5.1=runtimeClasspath com.azure:azure-sdk-bom:1.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.slf4j:slf4j-api:2.0.18=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile index 06422e46f1..18aee342dc 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.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile index 4096da9db9..d7506e2670 100644 --- a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics/gradle.lockfile b/agent/agent-profiler/agent-diagnostics/gradle.lockfile index c271389f72..4cc19f1aed 100644 --- a/agent/agent-profiler/agent-diagnostics/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index d97c29b7f0..3fb3fc38f0 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -53,21 +53,21 @@ io.netty:netty-transport-native-epoll:4.2.16.Final=runtimeClasspath io.netty:netty-transport-native-kqueue:4.2.16.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.2.16.Final=runtimeClasspath io.netty:netty-transport:4.2.16.Final=runtimeClasspath -io.opentelemetry.contrib:opentelemetry-jfr-connection:1.57.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-api:1.62.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath -io.opentelemetry:opentelemetry-common:1.62.0=runtimeClasspath -io.opentelemetry:opentelemetry-context:1.62.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-common:1.62.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.62.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.62.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-logs:1.62.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-metrics:1.62.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-trace:1.62.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk:1.62.0=runtimeClasspath +io.opentelemetry.contrib:opentelemetry-jfr-connection:1.59.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-api:1.64.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath +io.opentelemetry:opentelemetry-common:1.64.0=runtimeClasspath +io.opentelemetry:opentelemetry-context:1.64.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.64.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.64.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.64.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.64.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.64.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.64.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk:1.64.0=runtimeClasspath io.projectreactor.netty:reactor-netty-core:1.2.18=runtimeClasspath io.projectreactor.netty:reactor-netty-http:1.2.18=runtimeClasspath io.projectreactor:reactor-core:3.7.19=runtimeClasspath diff --git a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java index ec0eb7fa99..53fd6410f6 100644 --- a/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java +++ b/agent/agent-tooling/src/main/java/com/microsoft/applicationinsights/agent/internal/telemetry/BatchItemProcessor.java @@ -10,10 +10,10 @@ import com.azure.monitor.opentelemetry.autoconfigure.implementation.models.TelemetryItem; import com.azure.monitor.opentelemetry.autoconfigure.implementation.pipeline.TelemetryItemExporter; import io.opentelemetry.api.logs.LoggerProvider; -import io.opentelemetry.internal.shaded.jctools.queues.atomic.MpscAtomicArrayQueue; import io.opentelemetry.javaagent.bootstrap.CallDepth; import io.opentelemetry.sdk.common.CompletableResultCode; import io.opentelemetry.sdk.common.internal.DaemonThreadFactory; +import io.opentelemetry.sdk.trace.internal.JcTools; import java.util.ArrayList; import java.util.Collections; import java.util.Queue; @@ -56,7 +56,7 @@ public static BatchItemProcessorBuilder builder(TelemetryItemExporter exporter) long exporterTimeoutNanos, int maxPendingExports, String queueName) { - MpscAtomicArrayQueue queue = new MpscAtomicArrayQueue<>(maxQueueSize); + Queue queue = JcTools.newFixedSizeQueue(maxQueueSize); this.worker = new Worker( exporter, @@ -65,7 +65,7 @@ public static BatchItemProcessorBuilder builder(TelemetryItemExporter exporter) exporterTimeoutNanos, maxPendingExports, queue, - queue.capacity(), + (int) JcTools.capacity(queue), queueName); Thread workerThread = new DaemonThreadFactory(WORKER_THREAD_NAME).newThread(worker); diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile index dfbb24bbea..ebfd72182f 100644 --- a/agent/agent/gradle.lockfile +++ b/agent/agent/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile index 4825495029..b4ed46b14e 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.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile index 2d6e174fc4..81866b9a8e 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.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile index 5ce613cabe..b11dee1992 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.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile index 230f5b61fb..cbdbdd90f0 100644 --- a/agent/instrumentation/methods/gradle.lockfile +++ b/agent/instrumentation/methods/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile index d0ae702ddf..4254b64183 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.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile index 5e74b09457..74342b430e 100644 --- a/agent/runtime-attach/gradle.lockfile +++ b/agent/runtime-attach/gradle.lockfile @@ -5,12 +5,12 @@ com.azure:azure-sdk-bom:1.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.57.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.8=runtimeClasspath +io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.59.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.11=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index fe5a169fa8..08958dd1e0 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { implementation("org.owasp:dependency-check-gradle:12.2.2") - implementation("io.opentelemetry.instrumentation:gradle-plugins:2.28.1-alpha") + implementation("io.opentelemetry.instrumentation:gradle-plugins:2.30.0-alpha") implementation("net.ltgt.gradle:gradle-errorprone-plugin:5.1.0") implementation("net.ltgt.gradle:gradle-nullaway-plugin:3.1.0") diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile index b54f1bc8fe..df0dea8560 100644 --- a/classic-sdk/core/gradle.lockfile +++ b/classic-sdk/core/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile index 9530c5e732..36b6e92e8e 100644 --- a/classic-sdk/web/gradle.lockfile +++ b/classic-sdk/web/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath empty= diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index fc8ff90175..78811150fc 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -7,12 +7,12 @@ data class DependencySet(val group: String, val version: String, val modules: Li val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions -val otelSdkVersion = "1.62.0" -val otelSdkAlphaVersion = "1.62.0-alpha" -val otelInstrumentationAlphaVersion = "2.28.1-alpha" -val otelInstrumentationVersion = "2.28.1" +val otelSdkVersion = "1.64.0" +val otelSdkAlphaVersion = "1.64.0-alpha" +val otelInstrumentationAlphaVersion = "2.30.0-alpha" +val otelInstrumentationVersion = "2.30.0" val otelContribVersion = "1.56.0" -val otelContribAlphaVersion = "1.57.0-alpha" +val otelContribAlphaVersion = "1.59.0-alpha" rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaVersion diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index d3edc02f0e..516407f0d5 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.7=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.0=runtimeClasspath io.netty:netty-bom:4.2.16.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.28.1-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.28.1=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.62.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.62.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.30.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.30.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.64.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.64.0=runtimeClasspath org.junit:junit-bom:5.14.4=runtimeClasspath org.slf4j:slf4j-api:2.0.18=runtimeClasspath org.testcontainers:testcontainers-bom:2.0.5=runtimeClasspath diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 7a64a6bd82..4d73ee0270 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -169,47 +169,47 @@ > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0) -**32** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.62.0` +**32** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.64.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**33** **Group:** `io.opentelemetry` **Name:** `opentelemetry-common` **Version:** `1.62.0` +**33** **Group:** `io.opentelemetry` **Name:** `opentelemetry-common` **Version:** `1.64.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**34** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.62.0` +**34** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.64.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**35** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.62.0` +**35** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.64.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**36** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.62.0` +**36** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.64.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**37** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure` **Version:** `1.62.0` +**37** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure` **Version:** `1.64.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**38** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.62.0` +**38** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.64.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**39** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.62.0` +**39** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.64.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**40** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.62.0` +**40** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.64.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**41** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.62.0` +**41** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.64.0` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java](https://github.com/open-telemetry/opentelemetry-java) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0) -**42** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-jfr-connection` **Version:** `1.57.0-alpha` +**42** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-jfr-connection` **Version:** `1.59.0-alpha` > - **POM Project URL**: [https://github.com/open-telemetry/opentelemetry-java-contrib](https://github.com/open-telemetry/opentelemetry-java-contrib) > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)