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

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()) {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java

@@ -154,7 +154,7 @@ public BuildSystemModuleImpl testModuleStart(
       @Nullable JavaAgent jacocoAgent) {
     ExecutionSettings executionSettings = executionSettingsFactory.create(jvmInfo, moduleName);
     return new BuildSystemModuleImpl(
-        span.context(),
+        span.spanContext(),
         moduleName,
         startCommand,
         startTime,
@@ -178,7 +178,7 @@ public BuildSystemModuleImpl testModuleStart(
 
   @Override
   public AgentSpan testTaskStart(String taskName) {
-    return startSpan("ci_visibility", taskName, span.context());
+    return startSpan("ci_visibility", taskName, span.spanContext());
   }
 
   private void onModuleFinish(AgentSpan moduleSpan) {

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java

@@ -170,7 +170,7 @@ public TestSuiteImpl testSuiteStart(
       boolean parallelized,
       TestFrameworkInstrumentation instrumentation) {
     return new TestSuiteImpl(
-        span.context(),
+        span.spanContext(),
         moduleName,
         testSuiteName,
         executionStrategy.getExecutionSettings().getItrCorrelationId(),

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java

@@ -67,7 +67,7 @@ public HeadlessTestSession(
   @Override
   public HeadlessTestModule testModuleStart(String moduleName, @Nullable Long startTime) {
     return new HeadlessTestModule(
-        span.context(),
+        span.spanContext(),
         moduleName,
         startTime,
         config,

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java

@@ -65,7 +65,7 @@ public ManualApiTestSuite testSuiteStart(
       boolean parallelized) {
     TestSuiteImpl suite =
         new TestSuiteImpl(
-            span.context(),
+            span.spanContext(),
             moduleName,
             testSuiteName,
             null,

dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java

@@ -49,7 +49,7 @@ public ManualApiTestSession(
   @Override
   public ManualApiTestModule testModuleStart(String moduleName, @Nullable Long startTime) {
     return new ManualApiTestModule(
-        span.context(),
+        span.spanContext(),
         moduleName,
         startTime,
         config,

dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/decorator/TestDecoratorImplTest.groovy

@@ -22,7 +22,7 @@ class TestDecoratorImplTest extends Specification {
     then:
     1 * span.setTag(Tags.TEST_SESSION_NAME, "session-name")
     1 * span.setTag(Tags.COMPONENT, "test-component")
-    1 * span.context() >> context
+    1 * span.spanContext() >> context
     1 * context.setIntegrationName("test-component")
     1 * span.setTag(Tags.TEST_TYPE, decorator.testType())
     1 * span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP)
@@ -48,7 +48,7 @@ class TestDecoratorImplTest extends Specification {
     decorator.afterStart(span)
 
     then:
-    1 * span.context() >> context
+    1 * span.spanContext() >> context
     1 * context.setIntegrationName("test-component")
     1 * span.setTag(Tags.TEST_SESSION_NAME, expectedSessionName)
 

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java

@@ -1179,8 +1179,8 @@ private static Map<String, String> getDebugSessions() {
     if (tracer != null) {
       AgentSpan span = tracer.activeSpan();
       if (span instanceof DDSpan) {
-        DDSpanContext context = (DDSpanContext) span.context();
-        String debug = context.getPropagationTags().getDebugPropagation();
+        DDSpanContext spanContext = (DDSpanContext) span.spanContext();
+        String debug = spanContext.getPropagationTags().getDebugPropagation();
         if (debug != null) {
           String[] entries = debug.split(",");
           for (String entry : entries) {

dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/trigger/TriggerProbeTest.java

@@ -79,7 +79,7 @@ public void conditions() throws IOException, URISyntaxException {
             .filter(
                 span -> {
                   DDSpan ddSpan = (DDSpan) span;
-                  PropagationTags tags = ddSpan.context().getPropagationTags();
+                  PropagationTags tags = ddSpan.spanContext().getPropagationTags();
                   return (TRIGGER_PROBE_SESSION_ID + ":1").equals(tags.getDebugPropagation());
                 })
             .count();
@@ -137,7 +137,7 @@ public void cooldown() throws IOException, URISyntaxException {
               .filter(
                   span -> {
                     DDSpan ddSpan = (DDSpan) span;
-                    PropagationTags tags = ddSpan.context().getPropagationTags();
+                    PropagationTags tags = ddSpan.spanContext().getPropagationTags();
                     return (TRIGGER_PROBE_SESSION_ID + ":1").equals(tags.getDebugPropagation());
                   })
               .count();

dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/DDLLMObsSpan.java

@@ -122,16 +122,16 @@ public DDLLMObsSpan(
     }
     span.setTag(LLMOBS_TAG_PREFIX + PARENT_ID_TAG_INTERNAL, parentSpanID);
     // Propagate the effective sessionId to descendant LLMObs spans via the context.
-    scope = LLMObsContext.attach(span.context(), sessionId);
+    scope = LLMObsContext.attach(span.spanContext(), sessionId);
   }
 
   @Override
   public String toString() {
     return super.toString()
         + ", trace_id="
-        + span.context().getTraceId()
+        + span.spanContext().getTraceId()
         + ", span_id="
-        + span.context().getSpanId()
+        + span.spanContext().getSpanId()
         + ", ml_app="
         + span.getTag(LLMObsTags.ML_APP)
         + ", service="

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpan.java

@@ -47,7 +47,7 @@ public OtelSpan(AgentSpan delegate) {
     }
     this.statusCode = UNSET;
     this.recording = true;
-    delegate.context().setIntegrationName("otel");
+    delegate.spanContext().setIntegrationName("otel");
   }
 
   public static Span invalid() {
@@ -168,7 +168,7 @@ public AgentScope activate() {
   }
 
   public AgentSpanContext getAgentSpanContext() {
-    return this.delegate.context();
+    return this.delegate.spanContext();
   }
 
   @Override

dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanContext.java

@@ -24,7 +24,7 @@ public OtelSpanContext(
   }
 
   public static SpanContext fromLocalSpan(AgentSpan span) {
-    AgentSpanContext delegate = span.context();
+    AgentSpanContext delegate = span.spanContext();
     AgentSpan localRootSpan = span.getLocalRootSpan();
     Integer samplingPriority = localRootSpan.getSamplingPriority();
     boolean sampled = samplingPriority != null && samplingPriority > 0;

dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy

@@ -624,7 +624,7 @@ abstract class InstrumentationSpecification extends DDSpecification implements A
 
   static void blockUntilChildSpansFinished(AgentSpan span, int numberOfSpans) {
     if (span instanceof DDSpan) {
-      def traceCollector = ((DDSpan) span).context().getTraceCollector()
+      def traceCollector = ((DDSpan) span).spanContext().getTraceCollector()
       if (!(traceCollector instanceof PendingTrace)) {
         throw new IllegalStateException("Expected $PendingTrace.name trace collector, got $traceCollector.class.name")
       }

dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/TrackingSpanDecorator.groovy

@@ -261,8 +261,8 @@ class TrackingSpanDecorator implements AgentSpan {
   }
 
   @Override
-  AgentSpanContext context() {
-    return delegate.context()
+  AgentSpanContext spanContext() {
+    return delegate.spanContext()
   }
 
   @Override

dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/AbstractInstrumentationTest.java

@@ -196,7 +196,7 @@ protected void blockUntilChildSpansFinished(int numberOfSpans) {
 
   static void blockUntilChildSpansFinished(AgentSpan span, int numberOfSpans) {
     if (span instanceof DDSpan) {
-      TraceCollector traceCollector = ((DDSpan) span).context().getTraceCollector();
+      TraceCollector traceCollector = ((DDSpan) span).spanContext().getTraceCollector();
       if (!(traceCollector instanceof PendingTrace)) {
         throw new IllegalStateException(
             "Expected PendingTrace trace collector, got " + traceCollector.getClass().getName());

dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java

@@ -37,7 +37,7 @@ private SpanLinkMatcher(Matcher<DDTraceId> traceIdMatcher, Matcher<Long> spanIdM
    * @return A {@code SpanLinkMatcher} that matches a span link to the given span.
    */
   public static SpanLinkMatcher to(DDSpan span) {
-    return to(span.context());
+    return to(span.spanContext());
   }
 
   /**

dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java

@@ -150,7 +150,7 @@ public static final class TracingServerCallListener<ReqT>
     @Override
     public void onMessage(final ReqT message) {
       final AgentSpan msgSpan =
-          startSpan(DECORATE.instrumentationNames()[0], GRPC_MESSAGE, this.span.context())
+          startSpan(DECORATE.instrumentationNames()[0], GRPC_MESSAGE, this.span.spanContext())
               .setTag("message.type", message.getClass().getName());
       DECORATE.afterStart(msgSpan);
       try (AgentScope scope = activateSpan(msgSpan)) {

dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java

@@ -135,8 +135,8 @@ private void dsmCheckpoint(AgentSpan span, String streamArn, Response<?> respons
           PathwayContext pathwayContext = dataStreamsMonitoring.newPathwayContext();
           DataStreamsContext dataStreamsContext = create(tags, arrivalTime.getTime(), 0);
           pathwayContext.setCheckpoint(dataStreamsContext, dataStreamsMonitoring::add);
-          if (!span.context().getPathwayContext().isStarted()) {
-            span.context().mergePathwayContext(pathwayContext);
+          if (!span.spanContext().getPathwayContext().isStarted()) {
+            span.spanContext().mergePathwayContext(pathwayContext);
           }
         }
       }

dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java

@@ -365,8 +365,8 @@ public Context onSdkResponse(
                         pathwayContext.setCheckpoint(
                             create(tags, arrivalTime.toEpochMilli(), 0),
                             dataStreamsMonitoring::add);
-                        if (!span.context().getPathwayContext().isStarted()) {
-                          span.context().mergePathwayContext(pathwayContext);
+                        if (!span.spanContext().getPathwayContext().isStarted()) {
+                          span.spanContext().mergePathwayContext(pathwayContext);
                         }
                       }
                     }

dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java

@@ -96,7 +96,7 @@ protected void startNewMessageSpan(Message message) {
                       MILLISECONDS.toMicros(timeInQueueStart));
               BROKER_DECORATE.afterStart(queueSpan);
               BROKER_DECORATE.onTimeInQueue(queueSpan, queueUrl);
-              spanContext = queueSpan.context();
+              spanContext = queueSpan.spanContext();
               // The queueSpan will be finished after inner span has been activated to ensure that
               // spans are written out together by TraceStructureWriter when running in strict mode
             }

dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java

@@ -98,7 +98,7 @@ protected void startNewMessageSpan(Message message) {
                       MILLISECONDS.toMicros(timeInQueueStart));
               BROKER_DECORATE.afterStart(queueSpan);
               BROKER_DECORATE.onTimeInQueue(queueSpan, queueUrl, requestId);
-              spanContext = queueSpan.context();
+              spanContext = queueSpan.spanContext();
               // The queueSpan will be finished after inner span has been activated to ensure that
               // spans are written out together by TraceStructureWriter when running in strict mode
             }

dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestTracer.java

@@ -52,7 +52,7 @@ public RequestSpan requestSpan(String requestName, RequestSpan requestParent) {
 
     AgentTracer.SpanBuilder builder = tracer.singleSpanBuilder("couchbase", spanName);
     if (null != parent) {
-      builder.asChildOf(parent.context());
+      builder.asChildOf(parent.spanContext());
     }
     AgentSpan span = builder.start();
     CouchbaseClientDecorator.DECORATE.afterStart(span);

dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestTracer.java

@@ -56,7 +56,7 @@ public RequestSpan requestSpan(String requestName, RequestSpan requestParent) {
     if (requestSpan == null) {
       AgentTracer.SpanBuilder builder = tracer.singleSpanBuilder("couchbase", spanName);
       if (null != parent) {
-        builder.asChildOf(parent.context());
+        builder.asChildOf(parent.spanContext());
       }
       AgentSpan span = builder.start();
       CouchbaseClientDecorator.DECORATE.afterStart(span);

dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java

@@ -71,7 +71,7 @@ public static AgentScope onEnter(
       }
       final AgentSpan span =
           startSpan("dropwizard-view", "view.render").setTag(Tags.COMPONENT, "dropwizard-view");
-      span.context().setIntegrationName("dropwizard-view");
+      span.spanContext().setIntegrationName("dropwizard-view");
       span.setResourceName("View " + view.getTemplateName());
       return activateSpan(span);
     }

dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java

@@ -102,7 +102,7 @@ public InstrumentationContext<Document> beginParse(
       InstrumentationExecutionParameters parameters) {
     State state = parameters.getInstrumentationState();
     final AgentSpan parsingSpan =
-        startSpan(GRAPHQL_JAVA.toString(), GRAPHQL_PARSING, state.getRequestSpan().context());
+        startSpan(GRAPHQL_JAVA.toString(), GRAPHQL_PARSING, state.getRequestSpan().spanContext());
     DECORATE.afterStart(parsingSpan);
     return new ParsingInstrumentationContext(parsingSpan, state, parameters.getQuery());
   }
@@ -113,7 +113,8 @@ public InstrumentationContext<List<ValidationError>> beginValidation(
     State state = parameters.getInstrumentationState();
 
     final AgentSpan validationSpan =
-        startSpan(GRAPHQL_JAVA.toString(), GRAPHQL_VALIDATION, state.getRequestSpan().context());
+        startSpan(
+            GRAPHQL_JAVA.toString(), GRAPHQL_VALIDATION, state.getRequestSpan().spanContext());
     DECORATE.afterStart(validationSpan);
     return new ValidationInstrumentationContext(validationSpan);
   }

dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java

@@ -120,7 +120,7 @@ public InstrumentationContext<Document> beginParse(
         AgentTracer.startSpan(
             GraphQLDecorator.GRAPHQL_JAVA.toString(),
             GraphQLDecorator.GRAPHQL_PARSING,
-            state.getRequestSpan().context());
+            state.getRequestSpan().spanContext());
     GraphQLDecorator.DECORATE.afterStart(parsingSpan);
     return new ParsingInstrumentationContext(parsingSpan, state, parameters.getQuery());
   }
@@ -137,7 +137,7 @@ public InstrumentationContext<List<ValidationError>> beginValidation(
         AgentTracer.startSpan(
             GraphQLDecorator.GRAPHQL_JAVA.toString(),
             GraphQLDecorator.GRAPHQL_VALIDATION,
-            state.getRequestSpan().context());
+            state.getRequestSpan().spanContext());
     GraphQLDecorator.DECORATE.afterStart(validationSpan);
     return new ValidationInstrumentationContext(validationSpan);
   }