fix-linkage-error

digma-ai · Nov 28, 2024 · 33f7ed2 · 33f7ed2
1 parent 42735a4
commit 33f7ed2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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")