From 33f7ed29f6ecfb0a8b938cc48a3e7d3ad522766d Mon Sep 17 00:00:00 2001 From: Shalom Ben Zvi Kazaz Date: Thu, 28 Nov 2024 15:46:35 +0200 Subject: [PATCH] fix-linkage-error --- agent-extension/build.gradle.kts | 3 +-- gradle/libs.versions.toml | 3 ++- instrumentation/grpc-16/library/build.gradle.kts | 2 +- settings.gradle.kts | 6 ++---- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/agent-extension/build.gradle.kts b/agent-extension/build.gradle.kts index db0dcb9..100f946 100644 --- a/agent-extension/build.gradle.kts +++ b/agent-extension/build.gradle.kts @@ -51,8 +51,7 @@ dependencies { compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api") compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api") compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support") - implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.33.6-alpha") - compileOnly("io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.28.0-alpha") + implementation(libs.otelSemconv) //Provides @AutoService annotation that makes registration of our SPI implementations much easier compileOnly("com.google.auto.service:auto-service:1.1.1") diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b14f235..0916ccc 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,6 +3,7 @@ opentelemetrySdk = "1.44.1" opentelemetrySdkAlpha = "1.44.1-alpha" opentelemetryJavaagent = "2.10.0" opentelemetryJavaagentAlpha = "2.10.0-alpha" +opentelemetrySemconv = "1.33.6-alpha" junit = "5.10.2" logback = "1.5.3" @@ -17,7 +18,7 @@ otelSdkBom = { group = "io.opentelemetry", name = "opentelemetry-bom", version.r otelSdkBomAlpha = { group = "io.opentelemetry", name = "opentelemetry-bom-alpha", version.ref = "opentelemetrySdkAlpha" } otelAnnotations = { group = "io.opentelemetry.instrumentation", name = "opentelemetry-instrumentation-annotations", version.ref = "opentelemetrySdk" } otelJavaAgent = { group = "io.opentelemetry.javaagent", name = "opentelemetry-javaagent", version.ref = "opentelemetryJavaagent" } - +otelSemconv = { group = "io.opentelemetry.instrumentation", name = "opentelemetry-instrumentation-api-semconv", version.ref = "opentelemetrySemconv" } ## libraries that are included in the bom don't need a version opentelemetryTestingCommon = { group = "io.opentelemetry.javaagent", name = "opentelemetry-testing-common" } diff --git a/instrumentation/grpc-16/library/build.gradle.kts b/instrumentation/grpc-16/library/build.gradle.kts index 42a1a83..9647be7 100644 --- a/instrumentation/grpc-16/library/build.gradle.kts +++ b/instrumentation/grpc-16/library/build.gradle.kts @@ -35,7 +35,7 @@ dependencies { compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api") compileOnly("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6") compileOnly("io.grpc:grpc-core:$grpcVersion") - compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.33.6-alpha") + compileOnly(libs.otelSemconv) testImplementation("org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion") testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion") diff --git a/settings.gradle.kts b/settings.gradle.kts index 61b63d8..5a63470 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -19,11 +19,9 @@ dependencyResolutionManagement { rootProject.name = "digma-otel-java-instrumentation" -include(":libs:spring-boot-micrometer-tracing-autoconf") - - +//include(":libs:spring-boot-micrometer-tracing-autoconf") include(":instrumentation:common") -include(":instrumentation:spring:spring-boot-autoconfigure") +//include(":instrumentation:spring:spring-boot-autoconfigure") include(":instrumentation:grpc-16:library") include(":extension-version") include(":agent-extension")