Skip to content

Commit 33f7ed2

Browse files
committed
fix-linkage-error
1 parent 42735a4 commit 33f7ed2

File tree

4 files changed

+6
-8
lines changed

4 files changed

+6
-8
lines changed

agent-extension/build.gradle.kts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ dependencies {
5151
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api")
5252
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
5353
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations-support")
54-
implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.33.6-alpha")
55-
compileOnly("io.opentelemetry.semconv:opentelemetry-semconv-incubating:1.28.0-alpha")
54+
implementation(libs.otelSemconv)
5655

5756
//Provides @AutoService annotation that makes registration of our SPI implementations much easier
5857
compileOnly("com.google.auto.service:auto-service:1.1.1")

gradle/libs.versions.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ opentelemetrySdk = "1.44.1"
33
opentelemetrySdkAlpha = "1.44.1-alpha"
44
opentelemetryJavaagent = "2.10.0"
55
opentelemetryJavaagentAlpha = "2.10.0-alpha"
6+
opentelemetrySemconv = "1.33.6-alpha"
67
junit = "5.10.2"
78
logback = "1.5.3"
89

@@ -17,7 +18,7 @@ otelSdkBom = { group = "io.opentelemetry", name = "opentelemetry-bom", version.r
1718
otelSdkBomAlpha = { group = "io.opentelemetry", name = "opentelemetry-bom-alpha", version.ref = "opentelemetrySdkAlpha" }
1819
otelAnnotations = { group = "io.opentelemetry.instrumentation", name = "opentelemetry-instrumentation-annotations", version.ref = "opentelemetrySdk" }
1920
otelJavaAgent = { group = "io.opentelemetry.javaagent", name = "opentelemetry-javaagent", version.ref = "opentelemetryJavaagent" }
20-
21+
otelSemconv = { group = "io.opentelemetry.instrumentation", name = "opentelemetry-instrumentation-api-semconv", version.ref = "opentelemetrySemconv" }
2122

2223
## libraries that are included in the bom don't need a version
2324
opentelemetryTestingCommon = { group = "io.opentelemetry.javaagent", name = "opentelemetry-testing-common" }

instrumentation/grpc-16/library/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ dependencies {
3535
compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
3636
compileOnly("io.opentelemetry.instrumentation:opentelemetry-grpc-1.6")
3737
compileOnly("io.grpc:grpc-core:$grpcVersion")
38-
compileOnly("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-semconv:1.33.6-alpha")
38+
compileOnly(libs.otelSemconv)
3939

4040
testImplementation("org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion")
4141
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion")

settings.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@ dependencyResolutionManagement {
1919
rootProject.name = "digma-otel-java-instrumentation"
2020

2121

22-
include(":libs:spring-boot-micrometer-tracing-autoconf")
23-
24-
22+
//include(":libs:spring-boot-micrometer-tracing-autoconf")
2523
include(":instrumentation:common")
26-
include(":instrumentation:spring:spring-boot-autoconfigure")
24+
//include(":instrumentation:spring:spring-boot-autoconfigure")
2725
include(":instrumentation:grpc-16:library")
2826
include(":extension-version")
2927
include(":agent-extension")

0 commit comments

Comments
 (0)