From 28e5e0bfd1bdded91a70ffa765248b5933a44acd Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 27 Aug 2025 20:02:31 +0000 Subject: [PATCH 1/2] Initial plan From da58d9ae6d6eab2b9d073added05783ccc759466 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 27 Aug 2025 20:13:47 +0000 Subject: [PATCH 2/2] Update OpenTelemetry semantic conventions to 1.36.0 with split artifacts Co-authored-by: trask <218610+trask@users.noreply.github.com> --- agent/agent-bootstrap/build.gradle.kts | 2 +- agent/agent-tooling/build.gradle.kts | 4 ++++ .../applicationinsights-web-2.3/build.gradle.kts | 1 + agent/instrumentation/methods/build.gradle.kts | 1 + dependencyManagement/build.gradle.kts | 3 ++- smoke-tests/apps/OpenTelemetryApiLogBridge/build.gradle.kts | 2 +- 6 files changed, 10 insertions(+), 3 deletions(-) diff --git a/agent/agent-bootstrap/build.gradle.kts b/agent/agent-bootstrap/build.gradle.kts index 6fe23cabb7a..b55b74620e4 100644 --- a/agent/agent-bootstrap/build.gradle.kts +++ b/agent/agent-bootstrap/build.gradle.kts @@ -7,6 +7,6 @@ dependencies { // needed to access io.opentelemetry.instrumentation.api.aisdk.MicrometerUtil // TODO (heya) remove this when updating to upstream micrometer instrumentation compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api") - compileOnly("io.opentelemetry:opentelemetry-semconv") + compileOnly("io.opentelemetry.semconv:opentelemetry-semconv") compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator") } diff --git a/agent/agent-tooling/build.gradle.kts b/agent/agent-tooling/build.gradle.kts index 1fccbcb069e..349cfd9b6bd 100644 --- a/agent/agent-tooling/build.gradle.kts +++ b/agent/agent-tooling/build.gradle.kts @@ -66,6 +66,8 @@ dependencies { compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api") compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator") compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support") + compileOnly("io.opentelemetry.semconv:opentelemetry-semconv") + compileOnly("io.opentelemetry.semconv:opentelemetry-semconv-incubating") compileOnly("com.google.auto.value:auto-value-annotations") annotationProcessor("com.google.auto.value:auto-value") @@ -74,6 +76,8 @@ dependencies { testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api") testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator") testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support") + testImplementation("io.opentelemetry.semconv:opentelemetry-semconv") + testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating") testImplementation("org.junit.jupiter:junit-jupiter") testImplementation("com.azure:azure-core-test") diff --git a/agent/instrumentation/applicationinsights-web-2.3/build.gradle.kts b/agent/instrumentation/applicationinsights-web-2.3/build.gradle.kts index 11152ff5271..f572c0db202 100644 --- a/agent/instrumentation/applicationinsights-web-2.3/build.gradle.kts +++ b/agent/instrumentation/applicationinsights-web-2.3/build.gradle.kts @@ -18,6 +18,7 @@ dependencies { compileOnly("com.microsoft.azure:applicationinsights-web:2.3.0") testImplementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:$otelInstrumentationVersion") + testImplementation("io.opentelemetry.semconv:opentelemetry-semconv-incubating") testImplementation("com.microsoft.azure:applicationinsights-web:2.3.0") testImplementation("javax.servlet:javax.servlet-api:3.0.1") diff --git a/agent/instrumentation/methods/build.gradle.kts b/agent/instrumentation/methods/build.gradle.kts index e5551c71182..b3c47a3e1fe 100644 --- a/agent/instrumentation/methods/build.gradle.kts +++ b/agent/instrumentation/methods/build.gradle.kts @@ -15,6 +15,7 @@ dependencies { compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-tooling") compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support") compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator") + compileOnly("io.opentelemetry.semconv:opentelemetry-semconv-incubating") // TODO remove when start using io.opentelemetry.instrumentation.javaagent-instrumentation plugin add("codegen", "io.opentelemetry.javaagent:opentelemetry-javaagent-tooling:$otelInstrumentationAlphaVersion") diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 76f293eabc8..a6d184a4626 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -35,7 +35,8 @@ val mockitoVersion = "4.11.0" val slf4jVersion = "2.0.17" val CORE_DEPENDENCIES = listOf( - "io.opentelemetry:opentelemetry-semconv:1.30.1-alpha", + "io.opentelemetry.semconv:opentelemetry-semconv:1.36.0", + "io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.36.0-alpha", "io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:${otelInstrumentationAlphaVersion}", "com.google.auto.service:auto-service:${autoServiceVersion}", "com.google.auto.service:auto-service-annotations:${autoServiceVersion}", diff --git a/smoke-tests/apps/OpenTelemetryApiLogBridge/build.gradle.kts b/smoke-tests/apps/OpenTelemetryApiLogBridge/build.gradle.kts index 399eca57bfc..948716a6fc2 100644 --- a/smoke-tests/apps/OpenTelemetryApiLogBridge/build.gradle.kts +++ b/smoke-tests/apps/OpenTelemetryApiLogBridge/build.gradle.kts @@ -7,5 +7,5 @@ dependencies { exclude("org.springframework.boot", "spring-boot-starter-tomcat") } implementation("io.opentelemetry:opentelemetry-api:1.27.0") - implementation("io.opentelemetry.semconv:opentelemetry-semconv:1.22.0-alpha") + implementation("io.opentelemetry.semconv:opentelemetry-semconv") }