Attributes refactoring

digma-ai · Apr 18, 2024 · 05550ab · 05550ab
1 parent 43dba2a
commit 05550ab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/...ain/java/com/digma/otel/javaagent/extension/instrumentation/methods/PackageExtractor.java b/...ain/java/com/digma/otel/javaagent/extension/instrumentation/methods/PackageExtractor.java
@@ -1,5 +1,6 @@
 package com.digma.otel.javaagent.extension.instrumentation.methods;
 
+import com.digma.otel.instrumentation.common.DigmaSemanticAttributes;
 import io.opentelemetry.api.common.AttributeKey;
 import io.opentelemetry.api.common.AttributesBuilder;
 import io.opentelemetry.context.Context;
@@ -27,6 +28,7 @@ public void onStart(AttributesBuilder attributes, Context context, REQUEST reque
         Class<?> cls = this.getter.codeClass(request);
         if (cls != null) {
             AttributesExtractorUtil.internalSet(attributes, AttributeKey.stringKey("digma.instrumentation.extended.package"), cls.getPackage().getName());
+            AttributesExtractorUtil.internalSet(attributes, AttributeKey.stringKey("digma.instrumentation.extended.enabled"), "true");
         }
     }
 

diff --git a/...m/digma/otel/javaagent/extension/instrumentation/methods/MethodsInstrumentationTests.java b/...m/digma/otel/javaagent/extension/instrumentation/methods/MethodsInstrumentationTests.java
@@ -25,6 +25,8 @@ class MethodsInstrumentationTests {
 
     @RegisterExtension
     static final InstrumentationExtension testing = AgentInstrumentationExtension.create();
+    static final AttributeKey<String> EXTENDED_PACKAGE = AttributeKey.stringKey("digma.instrumentation.extended.package");
+    static final AttributeKey<String> EXTENDED_ENABLED = AttributeKey.stringKey("digma.instrumentation.extended.enabled");
 
     @Test
     void methodTraced() {
@@ -47,7 +49,8 @@ void methodTraced() {
                                                 .hasAttributesSatisfyingExactly(
                                                         equalTo(CODE_NAMESPACE, ConfigTracedCallable.class.getName()),
                                                         equalTo(CODE_FUNCTION, "call"),
-                                                        equalTo(AttributeKey.stringKey("digma.instrumentation.extended.package"), "com.digma.otel.javaagent.extension.instrumentation.methods.test"))));
+                                                        equalTo(EXTENDED_PACKAGE, "com.digma.otel.javaagent.extension.instrumentation.methods.test"),
+                                                        equalTo(EXTENDED_ENABLED, "true"))));
 
         Assertions.assertThat(testing.spans()).size().isEqualTo(1);
         testing.spans().forEach(spanData -> Assertions.assertThat(spanData.getInstrumentationScopeInfo().getName()).isEqualTo("digma.io.opentelemetry.methods"));
@@ -81,7 +84,8 @@ void methodTracedWithAsyncStop() throws Exception {
                                                 .hasAttributesSatisfyingExactly(
                                                         equalTo(CODE_NAMESPACE, ConfigTracedCompletableFuture.class.getName()),
                                                         equalTo(CODE_FUNCTION, "getResult"),
-                                                        equalTo(AttributeKey.stringKey("digma.instrumentation.extended.package"), "com.digma.otel.javaagent.extension.instrumentation.methods.test"))));
+                                                        equalTo(EXTENDED_PACKAGE, "com.digma.otel.javaagent.extension.instrumentation.methods.test"),
+                                                        equalTo(EXTENDED_ENABLED, "true"))));
 
         Assertions.assertThat(testing.spans()).size().isEqualTo(1);
         testing.spans().forEach(spanData -> Assertions.assertThat(spanData.getInstrumentationScopeInfo().getName()).isEqualTo("digma.io.opentelemetry.methods"));
@@ -107,15 +111,17 @@ void methodTracedAnonymousAndLambda() {
                                         .hasAttributesSatisfyingExactly(
                                                 equalTo(CODE_NAMESPACE, AnonymousTestClass.class.getName()),
                                                 equalTo(CODE_FUNCTION, "methodWithAnonymousClass"),
-                                                equalTo(AttributeKey.stringKey("digma.instrumentation.extended.package"), "com.digma.otel.javaagent.extension.instrumentation.methods.test"))),
+                                                equalTo(EXTENDED_PACKAGE, "com.digma.otel.javaagent.extension.instrumentation.methods.test"),
+                                                equalTo(EXTENDED_ENABLED, "true"))),
                 trace -> trace.hasSpansSatisfyingExactly(
                         span ->
                                 span.hasName("AnonymousTestClass.methodWithLambda")
                                         .hasKind(SpanKind.INTERNAL)
                                         .hasAttributesSatisfyingExactly(
                                                 equalTo(CODE_NAMESPACE, AnonymousTestClass.class.getName()),
                                                 equalTo(CODE_FUNCTION, "methodWithLambda"),
-                                                equalTo(AttributeKey.stringKey("digma.instrumentation.extended.package"), "com.digma.otel.javaagent.extension.instrumentation.methods.test"))));
+                                                equalTo(EXTENDED_PACKAGE, "com.digma.otel.javaagent.extension.instrumentation.methods.test"),
+                                                equalTo(EXTENDED_ENABLED, "true"))));
 
 
         Assertions.assertThat(testing.spans()).size().isEqualTo(2);