From c6276ce39a4683ff7a37859047f5be969df25417 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 17 Jan 2025 13:36:00 -0800 Subject: [PATCH 1/3] Bump otel versions --- agent/agent-tooling/build.gradle.kts | 2 +- agent/runtime-attach/build.gradle.kts | 2 +- dependencyManagement/build.gradle.kts | 11 ++++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/agent/agent-tooling/build.gradle.kts b/agent/agent-tooling/build.gradle.kts index 4d9c13517c1..9f1181c1d15 100644 --- a/agent/agent-tooling/build.gradle.kts +++ b/agent/agent-tooling/build.gradle.kts @@ -10,7 +10,7 @@ dependencies { compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") - implementation("io.opentelemetry.contrib:opentelemetry-jfr-connection:1.42.0-alpha") + implementation("io.opentelemetry.contrib:opentelemetry-jfr-connection") implementation("com.azure:azure-storage-blob") implementation(project(":agent:agent-profiler:agent-alerting-api")) diff --git a/agent/runtime-attach/build.gradle.kts b/agent/runtime-attach/build.gradle.kts index 8b3f827f770..17bb3b03a77 100644 --- a/agent/runtime-attach/build.gradle.kts +++ b/agent/runtime-attach/build.gradle.kts @@ -9,7 +9,7 @@ val otelContribAlphaVersion: String by project val agent: Configuration by configurations.creating dependencies { - implementation("io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.42.0-alpha") + implementation("io.opentelemetry.contrib:opentelemetry-runtime-attach-core") agent(project(":agent:agent", configuration = "shadow")) } diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 7292411e510..3f861793470 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -11,11 +11,11 @@ data class DependencySet(val group: String, val version: String, val modules: Li val dependencyVersions = hashMapOf() rootProject.extra["versions"] = dependencyVersions -val otelSdkVersion = "1.45.0" -val otelInstrumentationAlphaVersion = "2.11.0-alpha" -val otelInstrumentationVersion = "2.11.0" +val otelSdkVersion = "1.46.0" +val otelInstrumentationAlphaVersion = "2.12.0-alpha" +val otelInstrumentationVersion = "2.12.0" +val otelContribVersion = "1.43.0" -rootProject.extra["otelSdkVersion"] = otelSdkVersion rootProject.extra["otelInstrumentationVersion"] = otelInstrumentationVersion rootProject.extra["otelInstrumentationAlphaVersion"] = otelInstrumentationAlphaVersion @@ -72,7 +72,8 @@ val DEPENDENCIES = listOf( "org.assertj:assertj-core:3.27.2", "org.awaitility:awaitility:4.2.2", "io.github.hakky54:logcaptor:2.10.1", - "io.opentelemetry.contrib:opentelemetry-jfr-connection:1.42.0-alpha", + "io.opentelemetry.contrib:opentelemetry-jfr-connection:${otelContribVersion}-alpha", + "io.opentelemetry.contrib:opentelemetry-runtime-attach-core:${otelContribVersion}-alpha", "com.google.code.findbugs:jsr305:3.0.2", "com.github.spotbugs:spotbugs-annotations:4.8.6" ) From 9906e94d2ac19a5c093a9d676dfa27ceaa63bfed Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 17 Jan 2025 13:36:21 -0800 Subject: [PATCH 2/3] lock files --- agent/agent-bootstrap/gradle.lockfile | 8 ++--- agent/agent-for-testing/gradle.lockfile | 8 ++--- .../gc-monitor-api/gradle.lockfile | 8 ++--- .../gc-monitor-core/gradle.lockfile | 8 ++--- .../gc-monitor-tests/gradle.lockfile | 8 ++--- .../agent-alerting-api/gradle.lockfile | 8 ++--- .../agent-alerting/gradle.lockfile | 8 ++--- .../agent-diagnostics-api/gradle.lockfile | 8 ++--- .../agent-diagnostics-jfr/gradle.lockfile | 8 ++--- .../agent-diagnostics/gradle.lockfile | 8 ++--- agent/agent-tooling/gradle.lockfile | 30 +++++++++---------- agent/agent/gradle.lockfile | 8 ++--- .../gradle.lockfile | 8 ++--- .../gradle.lockfile | 8 ++--- .../azure-functions/gradle.lockfile | 8 ++--- agent/instrumentation/methods/gradle.lockfile | 8 ++--- .../micrometer-1.0/gradle.lockfile | 8 ++--- agent/runtime-attach/gradle.lockfile | 12 ++++---- classic-sdk/core/gradle.lockfile | 8 ++--- classic-sdk/web/gradle.lockfile | 8 ++--- etw/java/gradle.lockfile | 8 ++--- 21 files changed, 97 insertions(+), 97 deletions(-) diff --git a/agent/agent-bootstrap/gradle.lockfile b/agent/agent-bootstrap/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/agent/agent-bootstrap/gradle.lockfile +++ b/agent/agent-bootstrap/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/agent/agent-for-testing/gradle.lockfile b/agent/agent-for-testing/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/agent/agent-for-testing/gradle.lockfile +++ b/agent/agent-for-testing/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=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 43a32451260..e4d62e41759 100644 --- a/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-api/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.slf4j:slf4j-api:2.0.16=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile index 43a32451260..e4d62e41759 100644 --- a/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-core/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath com.google.errorprone:error_prone_annotations:2.36.0=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.slf4j:slf4j-api:2.0.16=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath diff --git a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile +++ b/agent/agent-gc-monitor/gc-monitor-tests/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting-api/gradle.lockfile b/agent/agent-profiler/agent-alerting-api/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/agent/agent-profiler/agent-alerting-api/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting-api/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-alerting/gradle.lockfile b/agent/agent-profiler/agent-alerting/gradle.lockfile index 25eb2220f89..0efd15f58f5 100644 --- a/agent/agent-profiler/agent-alerting/gradle.lockfile +++ b/agent/agent-profiler/agent-alerting/gradle.lockfile @@ -5,10 +5,10 @@ com.azure:azure-json:1.3.0=runtimeClasspath com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.slf4j:slf4j-api:2.0.16=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath diff --git a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-api/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics-jfr/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/agent/agent-profiler/agent-diagnostics/gradle.lockfile b/agent/agent-profiler/agent-diagnostics/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/agent/agent-profiler/agent-diagnostics/gradle.lockfile +++ b/agent/agent-profiler/agent-diagnostics/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/agent/agent-tooling/gradle.lockfile b/agent/agent-tooling/gradle.lockfile index 01e18c7fba3..114ba00ea77 100644 --- a/agent/agent-tooling/gradle.lockfile +++ b/agent/agent-tooling/gradle.lockfile @@ -52,23 +52,23 @@ io.netty:netty-transport-native-epoll:4.1.117.Final=runtimeClasspath io.netty:netty-transport-native-kqueue:4.1.117.Final=runtimeClasspath io.netty:netty-transport-native-unix-common:4.1.117.Final=runtimeClasspath io.netty:netty-transport:4.1.117.Final=runtimeClasspath -io.opentelemetry.contrib:opentelemetry-jfr-connection:1.42.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath +io.opentelemetry.contrib:opentelemetry-jfr-connection:1.43.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.29.0-alpha=runtimeClasspath io.opentelemetry.semconv:opentelemetry-semconv:1.29.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-api-incubator:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-api:1.45.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath -io.opentelemetry:opentelemetry-context:1.45.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-common:1.45.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.45.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.45.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-logs:1.45.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-metrics:1.45.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk-trace:1.45.0=runtimeClasspath -io.opentelemetry:opentelemetry-sdk:1.45.0=runtimeClasspath +io.opentelemetry:opentelemetry-api-incubator:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-api:1.46.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath +io.opentelemetry:opentelemetry-context:1.46.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-common:1.46.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.46.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.46.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-logs:1.46.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-metrics:1.46.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk-trace:1.46.0=runtimeClasspath +io.opentelemetry:opentelemetry-sdk:1.46.0=runtimeClasspath io.projectreactor.netty:reactor-netty-core:1.0.48=runtimeClasspath io.projectreactor.netty:reactor-netty-http:1.0.48=runtimeClasspath io.projectreactor:reactor-core:3.4.41=runtimeClasspath diff --git a/agent/agent/gradle.lockfile b/agent/agent/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/agent/agent/gradle.lockfile +++ b/agent/agent/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile +++ b/agent/instrumentation/applicationinsights-web-2.3/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile +++ b/agent/instrumentation/azure-functions-worker-stub/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/agent/instrumentation/azure-functions/gradle.lockfile b/agent/instrumentation/azure-functions/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/agent/instrumentation/azure-functions/gradle.lockfile +++ b/agent/instrumentation/azure-functions/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/agent/instrumentation/methods/gradle.lockfile b/agent/instrumentation/methods/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/agent/instrumentation/methods/gradle.lockfile +++ b/agent/instrumentation/methods/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/agent/instrumentation/micrometer-1.0/gradle.lockfile b/agent/instrumentation/micrometer-1.0/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/agent/instrumentation/micrometer-1.0/gradle.lockfile +++ b/agent/instrumentation/micrometer-1.0/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/agent/runtime-attach/gradle.lockfile b/agent/runtime-attach/gradle.lockfile index 5309c1ff0ef..eb6e2c1de8d 100644 --- a/agent/runtime-attach/gradle.lockfile +++ b/agent/runtime-attach/gradle.lockfile @@ -4,12 +4,12 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.42.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath -net.bytebuddy:byte-buddy-agent:1.15.10=runtimeClasspath +io.opentelemetry.contrib:opentelemetry-runtime-attach-core:1.43.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath +net.bytebuddy:byte-buddy-agent:1.15.11=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/classic-sdk/core/gradle.lockfile b/classic-sdk/core/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/classic-sdk/core/gradle.lockfile +++ b/classic-sdk/core/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/classic-sdk/web/gradle.lockfile b/classic-sdk/web/gradle.lockfile index 9a8be701355..38d83fd573d 100644 --- a/classic-sdk/web/gradle.lockfile +++ b/classic-sdk/web/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath empty= diff --git a/etw/java/gradle.lockfile b/etw/java/gradle.lockfile index e810f6ec3d8..a2194ceda12 100644 --- a/etw/java/gradle.lockfile +++ b/etw/java/gradle.lockfile @@ -4,10 +4,10 @@ com.azure:azure-sdk-bom:1.2.30=runtimeClasspath com.fasterxml.jackson:jackson-bom:2.18.2=runtimeClasspath io.netty:netty-bom:4.1.117.Final=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.11.0-alpha=runtimeClasspath -io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.11.0=runtimeClasspath -io.opentelemetry:opentelemetry-bom-alpha:1.45.0-alpha=runtimeClasspath -io.opentelemetry:opentelemetry-bom:1.45.0=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.12.0-alpha=runtimeClasspath +io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom:2.12.0=runtimeClasspath +io.opentelemetry:opentelemetry-bom-alpha:1.46.0-alpha=runtimeClasspath +io.opentelemetry:opentelemetry-bom:1.46.0=runtimeClasspath org.junit:junit-bom:5.11.4=runtimeClasspath org.slf4j:slf4j-api:2.0.16=runtimeClasspath org.testcontainers:testcontainers-bom:1.20.4=runtimeClasspath From 1f4090973b1346dbfd89f9e678545611912b2601 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 17 Jan 2025 13:36:38 -0800 Subject: [PATCH 3/3] Update license report --- licenses/more-licenses.md | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/licenses/more-licenses.md b/licenses/more-licenses.md index 05820e0003b..7acb56ff3de 100644 --- a/licenses/more-licenses.md +++ b/licenses/more-licenses.md @@ -1,7 +1,7 @@ # agent ## Dependency License Report -_2025-01-15 15:20:14 CET_ +_2025-01-17 13:36:30 PST_ ## Apache License, Version 2.0 **1** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.18.2` @@ -177,47 +177,47 @@ _2025-01-15 15:20:14 CET_ > - **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) -**33** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.45.0` +**33** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api` **Version:** `1.46.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-api-incubator` **Version:** `1.45.0-alpha` +**34** **Group:** `io.opentelemetry` **Name:** `opentelemetry-api-incubator` **Version:** `1.46.0-alpha` > - **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-context` **Version:** `1.45.0` +**35** **Group:** `io.opentelemetry` **Name:** `opentelemetry-context` **Version:** `1.46.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` **Version:** `1.45.0` +**36** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk` **Version:** `1.46.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-common` **Version:** `1.45.0` +**37** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-common` **Version:** `1.46.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` **Version:** `1.45.0` +**38** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure` **Version:** `1.46.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-extension-autoconfigure-spi` **Version:** `1.45.0` +**39** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-extension-autoconfigure-spi` **Version:** `1.46.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-logs` **Version:** `1.45.0` +**40** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-logs` **Version:** `1.46.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-metrics` **Version:** `1.45.0` +**41** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-metrics` **Version:** `1.46.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` **Name:** `opentelemetry-sdk-trace` **Version:** `1.45.0` +**42** **Group:** `io.opentelemetry` **Name:** `opentelemetry-sdk-trace` **Version:** `1.46.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) -**43** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-jfr-connection` **Version:** `1.42.0-alpha` +**43** **Group:** `io.opentelemetry.contrib` **Name:** `opentelemetry-jfr-connection` **Version:** `1.43.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)