Rename AgentSpan.context() to AgentSpan.spanContext() to disambiguate it from generic context (#11707)

Rename AgentSpan.context() to AgentSpan.spanContext() to disambiguate it from generic context

Rename some AgentSpanContext variables for consistency

Rename terminatedContextLinks -> terminatedSpanLinks

Merge branch 'master' into mcculls/disambiguate-agent-span-context

Co-authored-by: devflow.devflow-routing-intake <devflow.devflow-routing-intake@kubernetes.us1.ddbuild.io>

Author: mcculls

dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java

@@ -269,7 +269,7 @@ public Evaluation evaluate(final List<Message> messages, final Options options)
     final AgentTracer.SpanBuilder builder = tracer.buildSpan(SPAN_NAME, SPAN_NAME);
     final AgentSpan parent = AgentTracer.activeSpan();
     if (parent != null) {
-      builder.asChildOf(parent.context());
+      builder.asChildOf(parent.spanContext());
     }
     final AgentSpan span = builder.start();
     final AgentSpan localRootSpan = span.getLocalRootSpan();

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java

@@ -100,7 +100,7 @@ public AgentSpan afterStart(final AgentSpan span) {
     // DQH - Could retrieve the value from componentEntry and cast to avoid the virtual call,
     // unclear which option is better here
     final CharSequence component = component();
-    span.context().setIntegrationName(component);
+    span.spanContext().setIntegrationName(component);
 
     // null handled by setMetric
     span.setMetric(traceAnalyticsEntry);

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java

@@ -434,7 +434,7 @@ public AgentSpan onRequest(
   protected static AgentSpanContext.Extracted getExtractedSpanContext(Context parentContext) {
     AgentSpan extractedSpan = AgentSpan.fromContext(parentContext);
     if (extractedSpan != null) {
-      AgentSpanContext extractedSpanContext = extractedSpan.context();
+      AgentSpanContext extractedSpanContext = extractedSpan.spanContext();
       if (extractedSpanContext instanceof AgentSpanContext.Extracted) {
         return (AgentSpanContext.Extracted) extractedSpanContext;
       } else {

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java

@@ -144,7 +144,7 @@ private AgentSpan onFrameStart(
             wsSpan.setTag(DECISION_MAKER_RESOURCE, handshakeSpan.getResourceName());
           }
         } else {
-          wsSpan = startSpan(WEBSOCKET.toString(), operationName, handshakeSpan.context());
+          wsSpan = startSpan(WEBSOCKET.toString(), operationName, handshakeSpan.spanContext());
         }
       } else {
         wsSpan = startSpan(WEBSOCKET.toString(), operationName);
@@ -167,8 +167,8 @@ private AgentSpan onFrameStart(
         wsSpan.addLink(
             SpanLink.from(
                 inheritSampling
-                    ? handshakeSpan.context()
-                    : new NotSampledSpanContext(handshakeSpan.context()),
+                    ? handshakeSpan.spanContext()
+                    : new NotSampledSpanContext(handshakeSpan.spanContext()),
                 SpanLink.DEFAULT_FLAGS,
                 "",
                 linkAttributes));

dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy

@@ -31,7 +31,7 @@ class BaseDecoratorTest extends DDSpecification {
     then:
     1 * span.setSpanType(decorator.spanType())
     1 * span.setTag(TagMap.Entry.create(Tags.COMPONENT, "test-component"))
-    1 * span.context() >> spanContext
+    1 * span.spanContext() >> spanContext
     1 * spanContext.setIntegrationName("test-component")
     _ * span.setTag(_)
     _ * span.setTag(_, _) // Want to allow other calls from child implementations.

dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ClientDecoratorTest.groovy

@@ -24,7 +24,7 @@ class ClientDecoratorTest extends BaseDecoratorTest {
     }
     1 * span.setMeasured(true)
     1 * span.setTag(TagMap.Entry.create(Tags.COMPONENT, "test-component"))
-    1 * span.context() >> spanContext
+    1 * span.spanContext() >> spanContext
     1 * spanContext.setIntegrationName("test-component")
     1 * span.setTag(TagMap.Entry.create(Tags.SPAN_KIND, "client"))
     1 * span.setSpanType(decorator.spanType())

dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DBTypeProcessingDatabaseClientDecoratorTest.groovy

@@ -25,7 +25,7 @@ class DBTypeProcessingDatabaseClientDecoratorTest extends ClientDecoratorTest {
     }
     1 * span.setMeasured(true)
     1 * span.setTag(Tags.COMPONENT, "test-component")
-    1 * span.context() >> spanContext
+    1 * span.spanContext() >> spanContext
     1 * spanContext.setIntegrationName("test-component")
     1 * span.setTag(TagMap.Entry.create(Tags.SPAN_KIND, "client"))
     1 * span.setSpanType("test-type")

dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecoratorTest.groovy

@@ -28,7 +28,7 @@ class DatabaseClientDecoratorTest extends ClientDecoratorTest {
     }
     1 * span.setMeasured(true)
     1 * span.setTag(TagMap.Entry.create(Tags.COMPONENT, "test-component"))
-    1 * span.context() >> spanContext
+    1 * span.spanContext() >> spanContext
     1 * spanContext.setIntegrationName("test-component")
     1 * span.setTag(TagMap.Entry.create(Tags.SPAN_KIND, "client"))
     1 * span.setSpanType("test-type")

dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ServerDecoratorTest.groovy

@@ -24,7 +24,7 @@ class ServerDecoratorTest extends BaseDecoratorTest {
     then:
     1 * span.setTag(TagMap.Entry.create(LANGUAGE_TAG_KEY, LANGUAGE_TAG_VALUE))
     1 * span.setTag(TagMap.Entry.create(COMPONENT, "test-component"))
-    1 * span.context() >> spanContext
+    1 * span.spanContext() >> spanContext
     1 * spanContext.setIntegrationName("test-component")
     1 * span.setTag(TagMap.Entry.create(SPAN_KIND, "server"))
     1 * span.setSpanType(decorator.spanType())

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java

@@ -51,7 +51,7 @@ public AgentSpan afterStart(final AgentSpan span) {
     span.setTag(DDTags.HOST_VCPU_COUNT, cpuCount);
     span.setTag(Tags.TEST_TYPE, testType());
     span.setTag(Tags.COMPONENT, component());
-    span.context().setIntegrationName(component());
+    span.spanContext().setIntegrationName(component());
     span.setTag(Tags.TEST_SESSION_NAME, sessionName);
 
     for (final Map.Entry<String, String> ciTag : ciTags.entrySet()) {