diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index b53869fb9a..5511123705 100644 --- a/agent/agent-bootstrap/gradle.lockfile +++ b/agent/agent-bootstrap/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 5850fc763f..cef7d1b2a9 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.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 00228273b4..99e3a5bfbd 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.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath com.google.errorprone:error_prone_annotations:2.50.0=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 7fc9989aeb..335eac6e42 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.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath com.google.errorprone:error_prone_annotations:2.50.0=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 47ea35fb94..00f869ba1d 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.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 86536bc3f7..0987cf1b4c 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.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 d5b7156014..df8e780ca7 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.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 46f2e1f583..d5d7f87f0a 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.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 2a7f0b7c9d..2367ecd898 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.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 ffc80a1af6..af3d4dda31 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.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 8d6b36fd5c..48dfb1ff97 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.17.Final=runtimeClasspath io.netty:netty-transport-native-kqueue:4.2.17.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.2.17.Final=runtimeClasspath io.netty:netty-transport:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-api:1.65.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.0=runtimeClasspath +io.opentelemetry:opentelemetry-common:1.65.0=runtimeClasspath +io.opentelemetry:opentelemetry-context:1.65.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.65.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.65.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.65.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.65.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.65.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.65.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk:1.65.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 a3ff989799..80c28bf205 100644 --- a/agent/agent/gradle.lockfile +++ b/agent/agent/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 12ff099267..52c5e5113a 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.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 d53227a153..caca162090 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.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 97f2df3632..988ce08c4e 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.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 622311894a..dcbd1f2692 100644 --- a/agent/instrumentation/methods/gradle.lockfile +++ b/agent/instrumentation/methods/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 2e78afb0fb..37cb6ac9a5 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.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 2bc80eef3a..f6894ab5d5 100644 --- a/agent/runtime-attach/gradle.lockfile +++ b/agent/runtime-attach/gradle.lockfile @@ -5,12 +5,12 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 2f3bed0474..044ccfb3b5 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -36,7 +36,7 @@ dependencies { implementation("org.owasp:dependency-check-gradle:13.0.0") - 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 9634309868..c66cb7200f 100644 --- a/classic-sdk/core/gradle.lockfile +++ b/classic-sdk/core/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 5d89d9217d..2eed5f40d8 100644 --- a/classic-sdk/web/gradle.lockfile +++ b/classic-sdk/web/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 b69dee26a3..98dbee6ae4 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.65.0" +val otelSdkAlphaVersion = "1.65.0-alpha" +val otelInstrumentationAlphaVersion = "2.31.1-alpha" +val otelInstrumentationVersion = "2.31.1" 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 6830c37cae..59814b23c5 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.3.8=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.22.2=runtimeClasspath io.netty:netty-bom:4.2.17.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.31.1-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.31.1=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.65.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.65.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 2bc8e46731..28a6298779 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -169,47 +169,47 @@ > - **Manifest License**: [https://www.apache.org/licenses/LICENSE-2.0](Apache License, Version 2.0) > - **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.65.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.65.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.65.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.65.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.65.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.65.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.65.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.65.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.65.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.65.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)