fix-linkage-error

Author: shalom938

agent-extension/build.gradle.kts

@@ -51,6 +51,8 @@ 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")
 
     //Provides @AutoService annotation that makes registration of our SPI implementations much easier
     compileOnly("com.google.auto.service:auto-service:1.1.1")
@@ -146,6 +148,12 @@ tasks {
             archiveVersion.set(version.toString())
         }
 
+//        dependencies {
+////            exclude(dependency("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api-incubator:2.10.0-alpha"))
+////            exclude(dependency("io.opentelemetry.instrumentation:opentelemetry-instrumentation-api:2.10.0-alpha"))
+//            exclude(dependency("io.opentelemetry.*:.*:.*"))
+//        }
+
         //should be the same relocation as in digma-agent
         relocate("net.ttddyy.dsproxy", "org.digma.net.ttddyy.dsproxy")
 

agent-extension/src/main/java/com/digma/otel/javaagent/extension/instrumentation/junit/DigmaJunitInstrumentationModule.java

@@ -1,9 +1,9 @@
 package com.digma.otel.javaagent.extension.instrumentation.junit;
 
 import com.google.auto.service.AutoService;
-import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor;
-import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter;
-import io.opentelemetry.instrumentation.api.incubator.semconv.util.SpanNames;
+import io.opentelemetry.instrumentation.api.instrumenter.code.CodeAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.code.CodeAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.util.SpanNames;
 import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
 import io.opentelemetry.semconv.SemanticAttributes;

agent-extension/src/main/java/com/digma/otel/javaagent/extension/instrumentation/junit/JunitSingletons.java

@@ -3,8 +3,8 @@
 import com.digma.otel.instrumentation.common.DigmaSemanticAttributes;
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.SpanKind;
-import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor;
-import io.opentelemetry.instrumentation.api.incubator.semconv.util.SpanNames;
+import io.opentelemetry.instrumentation.api.instrumenter.code.CodeAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.util.SpanNames;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 

agent-extension/src/main/java/com/digma/otel/javaagent/extension/instrumentation/junit/MethodCodeAttributesGetter.java

@@ -1,6 +1,6 @@
 package com.digma.otel.javaagent.extension.instrumentation.junit;
 
-import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.code.CodeAttributesGetter;
 
 import javax.annotation.Nullable;
 import java.lang.reflect.Method;

agent-extension/src/main/java/com/digma/otel/javaagent/extension/instrumentation/methods/MethodSingletons.java

@@ -4,10 +4,10 @@
 
 import com.digma.otel.extension.extension.version.BuildVersion;
 import io.opentelemetry.api.GlobalOpenTelemetry;
-import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesExtractor;
-import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter;
-import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeSpanNameExtractor;
-import io.opentelemetry.instrumentation.api.incubator.semconv.util.ClassAndMethod;
+import io.opentelemetry.instrumentation.api.instrumenter.code.CodeAttributesExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.code.CodeAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.code.CodeSpanNameExtractor;
+import io.opentelemetry.instrumentation.api.instrumenter.util.ClassAndMethod;
 import io.opentelemetry.instrumentation.api.instrumenter.ErrorCauseExtractor;
 import io.opentelemetry.instrumentation.api.instrumenter.Instrumenter;
 import io.opentelemetry.instrumentation.api.instrumenter.SpanKindExtractor;

agent-extension/src/main/java/com/digma/otel/javaagent/extension/instrumentation/methods/MethodsInPackageTypeInstrumentation.java

@@ -5,7 +5,7 @@
 import io.opentelemetry.context.Context;
 import io.opentelemetry.context.Scope;
 import io.opentelemetry.instrumentation.api.annotation.support.async.AsyncOperationEndSupport;
-import io.opentelemetry.instrumentation.api.incubator.semconv.util.ClassAndMethod;
+import io.opentelemetry.instrumentation.api.instrumenter.util.ClassAndMethod;
 import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.method.MethodDescription;

agent-extension/src/main/java/com/digma/otel/javaagent/extension/instrumentation/methods/PackageExtractor.java

@@ -3,7 +3,7 @@
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
-import io.opentelemetry.instrumentation.api.incubator.semconv.code.CodeAttributesGetter;
+import io.opentelemetry.instrumentation.api.instrumenter.code.CodeAttributesGetter;
 import io.opentelemetry.instrumentation.api.instrumenter.AttributesExtractor;
 import io.opentelemetry.instrumentation.api.internal.AttributesExtractorUtil;
 

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

@@ -35,6 +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")
 
     testImplementation("org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion")
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion")

instrumentation/grpc-16/library/src/main/java/com/digma/otel/instrumentation/grpc/v1_6/DigmaTracingServerInterceptor.java

@@ -7,7 +7,7 @@
 import io.grpc.ServerCallHandler;
 import io.grpc.ServerInterceptor;
 import io.opentelemetry.api.trace.Span;
-import io.opentelemetry.instrumentation.api.incubator.semconv.util.ClassAndMethod;
+import io.opentelemetry.instrumentation.api.instrumenter.util.ClassAndMethod;
 import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
 
 import javax.annotation.Nonnull;