support span attributes for extended observability Closes #69 (#70)

Author: shalom938

agent-extension/src/main/java/com/digma/otel/javaagent/extension/instrumentation/extendedobservability/DigmaExtendedObservabilityInstrumentationModule.java

@@ -0,0 +1,39 @@
+package com.digma.otel.javaagent.extension.instrumentation.extendedobservability;
+
+import com.digma.otel.javaagent.extension.version.DigmaExtensionVersion;
+import com.google.auto.service.AutoService;
+import io.opentelemetry.javaagent.extension.instrumentation.InstrumentationModule;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeInstrumentation;
+import net.bytebuddy.matcher.ElementMatcher;
+
+import java.util.Collections;
+import java.util.List;
+
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
+
+
+@AutoService(InstrumentationModule.class)
+public class DigmaExtendedObservabilityInstrumentationModule extends InstrumentationModule {
+
+    public static final String DIGMA_MARKER_ANNOTATION_NAME = "org.digma.instrumentation.ExtendedObservability";
+
+    public DigmaExtendedObservabilityInstrumentationModule() {
+        super("digma-extended","digma-extended-"+ DigmaExtensionVersion.VERSION);
+    }
+
+    @Override
+    public int order() {
+        return 10000;
+    }
+
+    @Override
+    public ElementMatcher.Junction<ClassLoader> classLoaderMatcher() {
+        return hasClassesNamed(DIGMA_MARKER_ANNOTATION_NAME);
+    }
+
+    @Override
+    public List<TypeInstrumentation> typeInstrumentations() {
+        return Collections.singletonList(new ExtendedObservabilityTypeInstrumentation());
+    }
+
+}

agent-extension/src/main/java/com/digma/otel/javaagent/extension/instrumentation/extendedobservability/ExtendedObservabilityTypeInstrumentation.java

@@ -0,0 +1,60 @@
+package com.digma.otel.javaagent.extension.instrumentation.extendedobservability;
+
+import com.digma.otel.javaagent.extension.instrumentation.common.DigmaTypeInstrumentation;
+import io.opentelemetry.api.trace.Span;
+import io.opentelemetry.javaagent.bootstrap.Java8BytecodeBridge;
+import io.opentelemetry.javaagent.extension.instrumentation.TypeTransformer;
+import net.bytebuddy.asm.Advice;
+import net.bytebuddy.description.type.TypeDescription;
+import net.bytebuddy.matcher.ElementMatcher;
+import net.bytebuddy.matcher.ElementMatchers;
+
+import static com.digma.otel.javaagent.extension.instrumentation.extendedobservability.DigmaExtendedObservabilityInstrumentationModule.DIGMA_MARKER_ANNOTATION_NAME;
+import static io.opentelemetry.javaagent.extension.matcher.AgentElementMatchers.hasClassesNamed;
+import static net.bytebuddy.matcher.ElementMatchers.isAnnotatedWith;
+import static net.bytebuddy.matcher.ElementMatchers.named;
+
+public class ExtendedObservabilityTypeInstrumentation extends DigmaTypeInstrumentation {
+
+    @Override
+    public ElementMatcher<ClassLoader> classLoaderOptimization() {
+        return hasClassesNamed(DIGMA_MARKER_ANNOTATION_NAME);
+    }
+
+    @Override
+    public ElementMatcher<TypeDescription> digmaTypeMatcher() {
+        return ElementMatchers.declaresMethod(isAnnotatedWith(named(DIGMA_MARKER_ANNOTATION_NAME)));
+    }
+
+
+    @Override
+    public void transform(TypeTransformer transformer) {
+        transformer.applyAdviceToMethod(isAnnotatedWith(named(DIGMA_MARKER_ANNOTATION_NAME)),
+                ExtendedObservabilityTypeInstrumentation.class.getName() + "$MethodAdvice");
+    }
+
+
+
+    public static class MethodAdvice {
+
+        @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class)
+        public static void stopSpan(
+                @Advice.Origin("#t") Class<?> declaringClass) {
+
+            Span currentSpan = Java8BytecodeBridge.currentSpan();
+            if (currentSpan != null) {
+                String packageName = "";
+                if (declaringClass != null){
+                    packageName = declaringClass.getPackage().getName();
+                }
+                currentSpan.setAttribute("digma.instrumentation.extended.package",packageName);
+                currentSpan.setAttribute("digma.instrumentation.extended.enabled","true");
+            }
+        }
+
+
+
+    }
+
+
+}

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

@@ -42,6 +42,7 @@ public ElementMatcher<TypeDescription> digmaTypeMatcher() {
                 .and(not(typeFilterByAnnotation()))
                 .and(not(isSynthetic()))
                 .and(not(isEnum()))
+                .and(not(isRecord()))
                 .and(not(extendsClass(named("io.grpc.ServerBuilder"))))
                 .and(not(jaxrsTypes()))
                 .and(not(kafkaTypes()))

version.gradle.kts

@@ -1,5 +1,5 @@
 // keep the name theVersion and the val definition since script update_version.sh maintains it
-val theVersion = "0.8.12"
+val theVersion = "0.8.13"
 
 allprojects {
     group = "io.github.digma-ai"