Only root span gets AppD attributes set (#2247)

* Only root span gets AppD attributes set

* Fixed issue with null parent context.

* Fixed issue with null parent context.

* UT fix

Author: robsunday

custom/src/main/java/com/splunk/opentelemetry/appd/AppdBonusSpanProcessor.java

@@ -20,6 +20,7 @@
 import static io.opentelemetry.api.common.AttributeKey.stringKey;
 
 import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.extension.incubator.trace.OnStartSpanProcessor;
 import io.opentelemetry.sdk.trace.ReadWriteSpan;
@@ -37,17 +38,21 @@ public void apply(Context context, ReadWriteSpan span) {
     if (ctx == null) {
       return;
     }
-    if (ctx.getAccountId() != null) {
-      span.setAttribute(APPD_ATTR_ACCT, ctx.getAccountId());
-    }
-    if (ctx.getAppId() != null) {
-      span.setAttribute(APPD_ATTR_APP, ctx.getAppId());
-    }
-    if (ctx.getBusinessTransactionId() != null) {
-      span.setAttribute(APPD_ATTR_BT, ctx.getBusinessTransactionId());
-    }
-    if (ctx.getTierId() != null) {
-      span.setAttribute(APPD_ATTR_TIER, ctx.getTierId());
+    // Set attributes only for the local root span
+    SpanContext parentSpanContext = span.getParentSpanContext();
+    if (!parentSpanContext.isValid() || parentSpanContext.isRemote()) {
+      if (ctx.getAccountId() != null) {
+        span.setAttribute(APPD_ATTR_ACCT, ctx.getAccountId());
+      }
+      if (ctx.getAppId() != null) {
+        span.setAttribute(APPD_ATTR_APP, ctx.getAppId());
+      }
+      if (ctx.getBusinessTransactionId() != null) {
+        span.setAttribute(APPD_ATTR_BT, ctx.getBusinessTransactionId());
+      }
+      if (ctx.getTierId() != null) {
+        span.setAttribute(APPD_ATTR_TIER, ctx.getTierId());
+      }
     }
   }
 }

custom/src/test/java/com/splunk/opentelemetry/appd/AppdBonusCustomizerTest.java

@@ -31,6 +31,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.autoconfigure.spi.AutoConfigurationCustomizer;
 import io.opentelemetry.sdk.autoconfigure.spi.ConfigProperties;
@@ -98,8 +99,14 @@ void customizeEnabled() {
     tpcCaptor.getValue().apply(builder, config);
     ArgumentCaptor<SpanProcessor> spCapture = ArgumentCaptor.forClass(SpanProcessor.class);
     verify(builder).addSpanProcessor(spCapture.capture());
+
     ReadWriteSpan span = mock();
+    SpanContext parentSpanContext = mock(SpanContext.class);
+    when(parentSpanContext.isValid()).thenReturn(false);
+    when(span.getParentSpanContext()).thenReturn(parentSpanContext);
+
     spCapture.getValue().onStart(context, span);
+
     verify(span).setAttribute(APPD_ATTR_APP, appdContext.getAppId());
     verify(span).setAttribute(APPD_ATTR_ACCT, appdContext.getAccountId());
     verify(span).setAttribute(APPD_ATTR_TIER, appdContext.getTierId());

custom/src/test/java/com/splunk/opentelemetry/appd/AppdBonusSpanProcessorTest.java

@@ -22,30 +22,63 @@
 import static com.splunk.opentelemetry.appd.AppdBonusSpanProcessor.APPD_ATTR_BT;
 import static com.splunk.opentelemetry.appd.AppdBonusSpanProcessor.APPD_ATTR_TIER;
 import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
+import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.context.Context;
 import io.opentelemetry.sdk.trace.ReadWriteSpan;
 import org.junit.jupiter.api.Test;
 
 class AppdBonusSpanProcessorTest {
 
   @Test
-  void onStart() {
+  void shouldSetAppdAttributesOnRootSpan() {
+    // Given
     Context context = mock();
-
     AppdBonusContext appdContext = new AppdBonusContext("myacct", "myapp", "mybt", "mytier");
-    ReadWriteSpan span = mock();
-
     when(context.get(CONTEXT_KEY)).thenReturn(appdContext);
 
+    ReadWriteSpan span = mock();
+    SpanContext parentSpanContext = mock(SpanContext.class);
+    when(parentSpanContext.isValid()).thenReturn(false);
+    when(span.getParentSpanContext()).thenReturn(parentSpanContext);
+
     AppdBonusSpanProcessor testClass = new AppdBonusSpanProcessor();
+
+    // When
     testClass.apply(context, span);
 
+    // Then
     verify(span).setAttribute(APPD_ATTR_ACCT, "myacct");
     verify(span).setAttribute(APPD_ATTR_APP, "myapp");
     verify(span).setAttribute(APPD_ATTR_BT, "mybt");
     verify(span).setAttribute(APPD_ATTR_TIER, "mytier");
   }
+
+  @Test
+  void shouldNotSetAppdAttributesOnNestedSpans() {
+    // Given
+    Context context = mock();
+    AppdBonusContext appdContext = new AppdBonusContext("myacct", "myapp", "mybt", "mytier");
+    when(context.get(CONTEXT_KEY)).thenReturn(appdContext);
+
+    ReadWriteSpan span = mock();
+    SpanContext parentSpanContext = mock(SpanContext.class);
+    when(parentSpanContext.isValid()).thenReturn(true);
+    when(parentSpanContext.isRemote()).thenReturn(false);
+    when(span.getParentSpanContext()).thenReturn(parentSpanContext);
+
+    AppdBonusSpanProcessor testClass = new AppdBonusSpanProcessor();
+
+    // When
+    testClass.apply(context, span);
+
+    // Then
+    verify(span, never()).setAttribute(APPD_ATTR_ACCT, "myacct");
+    verify(span, never()).setAttribute(APPD_ATTR_APP, "myapp");
+    verify(span, never()).setAttribute(APPD_ATTR_BT, "mybt");
+    verify(span, never()).setAttribute(APPD_ATTR_TIER, "mytier");
+  }
 }