diff --git a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java index 1aabdff4598..55514ba0a52 100644 --- a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java +++ b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/AIGuardInternal.java @@ -269,7 +269,7 @@ public Evaluation evaluate(final List 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(); diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java index 6a8767e523f..2628e9416cf 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/BaseDecorator.java +++ b/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); diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java index 267d0149c3c..ed2b171778d 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java +++ b/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 { diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java index 2123caa395d..6684c4a7043 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/WebsocketDecorator.java +++ b/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)); diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy index 354a9c6bc4f..5b70cba2085 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/BaseDecoratorTest.groovy +++ b/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. diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ClientDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ClientDecoratorTest.groovy index 3b40a04a9bb..fec5748f089 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ClientDecoratorTest.groovy +++ b/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()) diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DBTypeProcessingDatabaseClientDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DBTypeProcessingDatabaseClientDecoratorTest.groovy index 85b9d6fd66a..624100fcc50 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DBTypeProcessingDatabaseClientDecoratorTest.groovy +++ b/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") diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecoratorTest.groovy index 164138cbe0f..93852ccc88c 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/DatabaseClientDecoratorTest.groovy +++ b/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") diff --git a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ServerDecoratorTest.groovy b/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ServerDecoratorTest.groovy index ae41a1f523b..d60c1534627 100644 --- a/dd-java-agent/agent-bootstrap/src/test/groovy/datadog/trace/bootstrap/instrumentation/decorator/ServerDecoratorTest.groovy +++ b/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()) diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java index de2ab526728..26b278e0587 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/decorator/TestDecoratorImpl.java +++ b/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 ciTag : ciTags.entrySet()) { diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java index de116acf05c..3d33141dd19 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/buildsystem/BuildSystemSessionImpl.java +++ b/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) { diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java index 1c111bba967..f17fcd2a4c6 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestModule.java +++ b/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(), diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java index 1024104361c..41edbef64cf 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/headless/HeadlessTestSession.java +++ b/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, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java index 4b4fb8e8f1f..8ca29a07079 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestModule.java +++ b/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, diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java index 917bf9ddbc0..728b7d09b21 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/domain/manualapi/ManualApiTestSession.java +++ b/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, diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/decorator/TestDecoratorImplTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/decorator/TestDecoratorImplTest.groovy index d1d415428df..1f7de97d672 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/decorator/TestDecoratorImplTest.groovy +++ b/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) diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java index 5cdc2354409..3418ea1af4d 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/LogProbe.java @@ -1179,8 +1179,8 @@ private static Map 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) { diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/trigger/TriggerProbeTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/trigger/TriggerProbeTest.java index 6b895a9dc13..ea6f181b4d1 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/trigger/TriggerProbeTest.java +++ b/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(); diff --git a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/DDLLMObsSpan.java b/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/DDLLMObsSpan.java index 13d81701cd1..ac304698652 100644 --- a/dd-java-agent/agent-llmobs/src/main/java/datadog/trace/llmobs/domain/DDLLMObsSpan.java +++ b/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=" diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpan.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpan.java index ffe6cce4ea6..34bf7f2a486 100644 --- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpan.java +++ b/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 diff --git a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanContext.java b/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanContext.java index 759e3ac4910..8a39a88b1dd 100644 --- a/dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelSpanContext.java +++ b/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; diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy index be0b321216e..8f1a6cd6df4 100644 --- a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy +++ b/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") } diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/TrackingSpanDecorator.groovy b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/TrackingSpanDecorator.groovy index a3aee830cf8..b9de4adad0e 100644 --- a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/TrackingSpanDecorator.groovy +++ b/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 diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/AbstractInstrumentationTest.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/AbstractInstrumentationTest.java index a82c8319abd..5f724853972 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/AbstractInstrumentationTest.java +++ b/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()); diff --git a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java index ef70ace9764..c940565629c 100644 --- a/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java +++ b/dd-java-agent/instrumentation-testing/src/main/java/datadog/trace/agent/test/assertions/SpanLinkMatcher.java @@ -37,7 +37,7 @@ private SpanLinkMatcher(Matcher traceIdMatcher, Matcher 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()); } /** diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java index be36634f48e..9661d73feaf 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/server/TracingServerInterceptor.java +++ b/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 @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)) { diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java index 89b49fa2c1b..8cb0a054342 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java +++ b/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); } } } diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java index b0c92a6c8e7..1404e1f8e9c 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java +++ b/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); } } } diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java index 1d6f379145e..58943212038 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/TracingIterator.java +++ b/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 } diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java index 8a1214447c3..95018f1815a 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/TracingIterator.java +++ b/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 } diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestTracer.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestTracer.java index 14c0105d31c..bd508d4bd85 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/src/main/java/datadog/trace/instrumentation/couchbase_31/client/DatadogRequestTracer.java +++ b/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); diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestTracer.java b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestTracer.java index 6bdb7c0526a..8463e0e20b9 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/src/main/java/datadog/trace/instrumentation/couchbase_32/client/DatadogRequestTracer.java +++ b/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); diff --git a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java b/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java index 3e88551ebc2..119516a05f3 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-views-0.7/src/main/java/datadog/trace/instrumentation/dropwizard/view/DropwizardViewInstrumentation.java +++ b/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); } diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java index c7f0abf0705..14c2753d1c0 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-14.0/src/main/java/datadog/trace/instrumentation/graphqljava14/GraphQLInstrumentation.java +++ b/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 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> 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); } diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java index 0e736c6e4fb..5a88ec3dd81 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/src/main/java/datadog/trace/instrumentation/graphqljava20/GraphQLInstrumentation.java +++ b/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 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> beginValidation( AgentTracer.startSpan( GraphQLDecorator.GRAPHQL_JAVA.toString(), GraphQLDecorator.GRAPHQL_VALIDATION, - state.getRequestSpan().context()); + state.getRequestSpan().spanContext()); GraphQLDecorator.DECORATE.afterStart(validationSpan); return new ValidationInstrumentationContext(validationSpan); } diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java index 8faacaf0f32..3d74cb5f8a4 100644 --- a/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java +++ b/dd-java-agent/instrumentation/graphql-java/graphql-java-common/src/main/java/datadog/trace/instrumentation/graphqljava/InstrumentedDataFetcher.java @@ -36,7 +36,7 @@ public Object get(DataFetchingEnvironment environment) throws Exception { } } else { final AgentSpan fieldSpan = - startSpan(GRAPHQL_JAVA.toString(), "graphql.field", this.requestSpan.context()); + startSpan(GRAPHQL_JAVA.toString(), "graphql.field", this.requestSpan.spanContext()); DECORATE.afterStart(fieldSpan); String parentType = GraphQLTypeUtil.simplePrint(environment.getParentType()); String fieldName = environment.getField().getName(); diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java index db605914bb9..4726080cbe2 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/TracingServerInterceptor.java @@ -151,7 +151,7 @@ static final class TracingServerCallListener @Override public void onMessage(final ReqT message) { final AgentSpan msgSpan = - startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE, this.span.context()) + startSpan(COMPONENT_NAME.toString(), GRPC_MESSAGE, this.span.spanContext()) .setTag("message.type", message.getClass().getName()); DECORATE.afterStart(msgSpan); try (AgentScope scope = activateSpan(msgSpan)) { diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java index 2b95ae67ea9..ac81ce40f7b 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java +++ b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionMethodUtils.java @@ -42,7 +42,7 @@ public static SessionState startScopeFrom( final AgentScope scope; if (createSpan) { final AgentSpan span = - startSpan("java-hibernate", operationName, sessionState.getSessionSpan().context()); + startSpan("java-hibernate", operationName, sessionState.getSessionSpan().spanContext()); DECORATOR.afterStart(span); DECORATOR.onOperation(span, entity); scope = activateSpan(span); diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java index ca368998c25..4ddccaf80a0 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-1.8/src/main/java/datadog/trace/instrumentation/java/lang/ProcessImplStartAdvice.java @@ -30,7 +30,7 @@ public static AgentSpan beforeStart( span.setSpanType("system"); span.setResourceName(ProcessImplInstrumentationHelpers.determineResource(command)); span.setTag("component", "subprocess"); - span.context().setIntegrationName("subprocess"); + span.spanContext().setIntegrationName("subprocess"); ProcessImplInstrumentationHelpers.setTags(span, command); ProcessImplInstrumentationHelpers.cmdiRaspCheck(command); return span; diff --git a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java index ea9bf2758ae..4e8cc81ef37 100644 --- a/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java +++ b/dd-java-agent/instrumentation/jboss/jboss-logmanager-1.1/src/main/java/datadog/trace/instrumentation/jbosslogmanager/LoggerNodeInstrumentation.java @@ -56,7 +56,7 @@ public static boolean attachContext(@Advice.Argument(0) ExtLogRecord record) { if (span != null && traceConfig(span).isLogsInjectionEnabled()) { InstrumentationContext.get(ExtLogRecord.class, AgentSpanContext.class) - .put(record, span.context()); + .put(record, span.spanContext()); } return true; diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java index 439249c37be..76aacf64d5f 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/JDBCDecorator.java @@ -276,7 +276,7 @@ private AgentSpan withQueryInfo(AgentSpan span, DBQueryInfo info, CharSequence c } else { span.setResourceName(DB_QUERY); } - span.context().setIntegrationName(component); + span.spanContext().setIntegrationName(component); return span.setTag(Tags.COMPONENT, component); } diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java index 954dec71ad0..c597552fb27 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/DatadogMessageListener.java @@ -58,7 +58,7 @@ public void onMessage(Message message) { consumerState.getBrokerServiceName()); consumerState.setTimeInQueueSpan(batchId, timeInQueue); } - span = startSpan("jms", JMS_CONSUME, timeInQueue.context()); + span = startSpan("jms", JMS_CONSUME, timeInQueue.spanContext()); } CONSUMER_DECORATE.afterStart(span); CONSUMER_DECORATE.onConsume(span, message, consumerState.getConsumerResourceName()); diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java index 75a59e7406d..707876869db 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageConsumerInstrumentation.java @@ -156,7 +156,7 @@ public static void afterReceive( consumerState.getBrokerServiceName()); consumerState.setTimeInQueueSpan(batchId, timeInQueue); } - span = startSpan("jms", JMS_CONSUME, timeInQueue.context()); + span = startSpan("jms", JMS_CONSUME, timeInQueue.spanContext()); } CONSUMER_DECORATE.afterStart(span); diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java index 1887e0a5205..b425b7a67c6 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java @@ -287,7 +287,7 @@ public static class PayloadSizeAdvice { */ @Advice.OnMethodEnter(suppress = Throwable.class) public static void onEnter(@Advice.Argument(value = 0) int estimatedPayloadSize) { - StatsPoint saved = activeSpan().context().getPathwayContext().getSavedStats(); + StatsPoint saved = activeSpan().spanContext().getPathwayContext().getSavedStats(); if (saved != null) { // create new stats including the payload size StatsPoint updated = diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java index bbf30914e3b..ada3c0f31c6 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/TracingIterator.java @@ -115,7 +115,7 @@ protected void startNewRecordSpan(ConsumerRecord val) { MILLISECONDS.toMicros(timeInQueueStart)); BROKER_DECORATE.afterStart(queueSpan); BROKER_DECORATE.onTimeInQueue(queueSpan, val); - span = startSpan(JAVA_KAFKA.toString(), operationName, queueSpan.context()); + span = startSpan(JAVA_KAFKA.toString(), operationName, queueSpan.spanContext()); BROKER_DECORATE.beforeFinish(queueSpan); // 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 diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java index 7db4e95e711..3b4effb3979 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java @@ -15,7 +15,7 @@ public class PayloadSizeAdvice { */ @Advice.OnMethodEnter(suppress = Throwable.class) public static void onEnter(@Advice.Argument(value = 0) int estimatedPayloadSize) { - StatsPoint saved = activeSpan().context().getPathwayContext().getSavedStats(); + StatsPoint saved = activeSpan().spanContext().getPathwayContext().getSavedStats(); if (saved != null) { // create new stats including the payload size StatsPoint updated = diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java index eb1f0633908..e38094ac392 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/TracingIterator.java @@ -111,7 +111,7 @@ protected void startNewRecordSpan(ConsumerRecord val) { MILLISECONDS.toMicros(timeInQueueStart)); KafkaDecorator.BROKER_DECORATE.afterStart(queueSpan); KafkaDecorator.BROKER_DECORATE.onTimeInQueue(queueSpan, val); - span = startSpan(JAVA_KAFKA.toString(), operationName, queueSpan.context()); + span = startSpan(JAVA_KAFKA.toString(), operationName, queueSpan.spanContext()); KafkaDecorator.BROKER_DECORATE.beforeFinish(queueSpan); // 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 diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java index 26da9ec0018..4c3f94ee210 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/KafkaStreamTaskInstrumentation.java @@ -288,7 +288,7 @@ public static void start( JAVA_KAFKA.toString(), KAFKA_DELIVER, MILLISECONDS.toMicros(timeInQueueStart)); BROKER_DECORATE.afterStart(queueSpan); BROKER_DECORATE.onTimeInQueue(queueSpan, record); - span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME, queueSpan.context()); + span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME, queueSpan.spanContext()); BROKER_DECORATE.beforeFinish(queueSpan); // 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 @@ -354,7 +354,7 @@ public static void start( JAVA_KAFKA.toString(), KAFKA_DELIVER, MILLISECONDS.toMicros(timeInQueueStart)); BROKER_DECORATE.afterStart(queueSpan); BROKER_DECORATE.onTimeInQueue(queueSpan, record); - span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME, queueSpan.context()); + span = startSpan(JAVA_KAFKA.toString(), KAFKA_CONSUME, queueSpan.spanContext()); BROKER_DECORATE.beforeFinish(queueSpan); // 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 diff --git a/dd-java-agent/instrumentation/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java b/dd-java-agent/instrumentation/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java index 1f56a1e7ebb..542d82ef641 100644 --- a/dd-java-agent/instrumentation/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java +++ b/dd-java-agent/instrumentation/karate-1.0/src/main/java/datadog/trace/instrumentation/karate/KarateTracingHook.java @@ -205,7 +205,7 @@ public boolean beforeStep(Step step, ScenarioRuntime sr) { String stepName = step.getPrefix() + " " + step.getText(); span.setResourceName(stepName); span.setTag(Tags.COMPONENT, "karate"); - span.context().setIntegrationName("karate"); + span.spanContext().setIntegrationName("karate"); span.setTag("step.name", stepName); span.setTag("step.startLine", step.getLine()); span.setTag("step.endLine", step.getEndLine()); diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/latestDepTest/groovy/KotlinCoroutineInstrumentationTest.groovy b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/latestDepTest/groovy/KotlinCoroutineInstrumentationTest.groovy index 23f5c86bf70..04cc6b46e93 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/latestDepTest/groovy/KotlinCoroutineInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/latestDepTest/groovy/KotlinCoroutineInstrumentationTest.groovy @@ -19,8 +19,8 @@ class KotlinCoroutineInstrumentationTest extends AbstractKotlinCoroutineInstrume expect: trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "KotlinCoroutineTests.tracedAcrossFlows" - findSpan(trace, "produce_2").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "consume_2").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "produce_2").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "consume_2").spanContext().getParentId() == trace[0].spanContext().getSpanId() where: [dispatcherName, dispatcher] << dispatchersToTest @@ -36,8 +36,8 @@ class KotlinCoroutineInstrumentationTest extends AbstractKotlinCoroutineInstrume expect: trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "KotlinCoroutineTests.tracedAcrossFlows" - findSpan(trace, "produce_2").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "consume_2").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "produce_2").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "consume_2").spanContext().getParentId() == trace[0].spanContext().getSpanId() where: [dispatcherName, dispatcher] << dispatchersToTest diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy index d905b9d87f8..096cf1b7ca1 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/test/groovy/KotlinCoroutineInstrumentationTest.groovy @@ -22,8 +22,8 @@ class KotlinCoroutineInstrumentationTest extends AbstractKotlinCoroutineInstrume expect: trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "KotlinCoroutineTests.tracedAcrossChannels" - findSpan(trace, "produce_2").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "consume_2").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "produce_2").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "consume_2").spanContext().getParentId() == trace[0].spanContext().getSpanId() where: [dispatcherName, dispatcher] << dispatchersToTest diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/groovy/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutineInstrumentationTest.groovy b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/groovy/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutineInstrumentationTest.groovy index a8d62eafa6b..4298933db84 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/groovy/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutineInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/groovy/datadog/trace/instrumentation/kotlin/coroutines/AbstractKotlinCoroutineInstrumentationTest.groovy @@ -30,7 +30,7 @@ abstract class AbstractKotlinCoroutineInstrumentationTest list, StringMap reusable) { } if (span != null) { - DDTraceId traceId = span.context().getTraceId(); + DDTraceId traceId = span.spanContext().getTraceId(); String traceIdValue = Config.get().isLogs128bitTraceIdEnabled() && traceId.toHighOrderLong() != 0 ? traceId.toHexString() : traceId.toString(); newContextData.putValue(CorrelationIdentifier.getTraceIdKey(), traceIdValue); newContextData.putValue( - CorrelationIdentifier.getSpanIdKey(), DDSpanId.toString(span.context().getSpanId())); + CorrelationIdentifier.getSpanIdKey(), DDSpanId.toString(span.spanContext().getSpanId())); } newContextData.putAll(contextData); diff --git a/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java b/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java index 7c3b9e6435d..b759323f9bd 100644 --- a/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java +++ b/dd-java-agent/instrumentation/logback-1.0/src/main/java/datadog/trace/instrumentation/logback/LogbackLoggerInstrumentation.java @@ -78,7 +78,7 @@ public static void onEnter(@Advice.Argument(0) ILoggingEvent event) { if (span != null && traceConfig(span).isLogsInjectionEnabled()) { InstrumentationContext.get(ILoggingEvent.class, AgentSpanContext.class) - .put(event, span.context()); + .put(event, span.spanContext()); } } } diff --git a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java index dd2645d04db..84db07d3e55 100644 --- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java +++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/MuleDecorator.java @@ -70,7 +70,7 @@ public AgentSpan onMuleSpan( if (parentSpan == null) { span = startSpan("mule", OPERATION_NAME); } else { - span = startSpan("mule", OPERATION_NAME, parentSpan.context()); + span = startSpan("mule", OPERATION_NAME, parentSpan.spanContext()); } // here we have to use the forEachAttribute since each specialized InitialSpanInfo class can add // different things through this method. Using the map version is not the same. diff --git a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java index ba6060fced0..2757b52f7d9 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-3.8/src/main/java/datadog/trace/instrumentation/netty38/ChannelFutureListenerInstrumentation.java @@ -109,7 +109,7 @@ public static AgentScope activateScope(@Advice.Argument(0) final ChannelFuture f final AgentScope parentScope = continuation.activate(); final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty"); - errorSpan.context().setIntegrationName(NETTY); + errorSpan.spanContext().setIntegrationName(NETTY); try (final ContextScope scope = getCurrentContext().with(errorSpan).attach()) { DECORATE.onError(errorSpan, cause); DECORATE.beforeFinish(scope.context()); diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java index b0be195bdfb..0bb84c90181 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/ChannelFutureListenerInstrumentation.java @@ -94,7 +94,7 @@ public static AgentScope activateScope(@Advice.Argument(0) final ChannelFuture f final AgentScope parentScope = continuation.activate(); final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty"); - errorSpan.context().setIntegrationName(NETTY); + errorSpan.spanContext().setIntegrationName(NETTY); try (final ContextScope scope = getCurrentContext().with(errorSpan).attach()) { NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause); NettyHttpServerDecorator.DECORATE.beforeFinish(scope.context()); diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java index 831166a7923..1239363a25e 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/ChannelFutureListenerInstrumentation.java @@ -94,7 +94,7 @@ public static AgentScope activateScope(@Advice.Argument(0) final ChannelFuture f final AgentScope parentScope = continuation.activate(); final AgentSpan errorSpan = startSpan("netty", NETTY_CONNECT).setTag(Tags.COMPONENT, "netty"); - errorSpan.context().setIntegrationName(NETTY); + errorSpan.spanContext().setIntegrationName(NETTY); try (final ContextScope scope = getCurrentContext().with(errorSpan).attach()) { NettyHttpServerDecorator.DECORATE.onError(errorSpan, cause); NettyHttpServerDecorator.DECORATE.beforeFinish(scope.context()); diff --git a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java index 32978abf35d..031ecd4982a 100644 --- a/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java +++ b/dd-java-agent/instrumentation/ognl-appsec-3.3.2/src/main/java/datadog/trace/instrumentation/ognl/OgnlInstrumentation.java @@ -41,7 +41,7 @@ static void before(@Advice.Argument(0) String expression) { return; } - AgentSpan agentSpan = startSpan("ognl", "ognl.parse", parentSpan.context()); + AgentSpan agentSpan = startSpan("ognl", "ognl.parse", parentSpan.spanContext()); agentSpan.setTag("ognl.expression", expression); agentSpan.finish(); } diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java index 581d6f3b459..19695ee9ea7 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/test/java/datadog/trace/instrumentation/openai_java/SessionIdPropagationForkedTest.java @@ -78,7 +78,8 @@ void openAiRequestSpanInheritsSessionIdFromActiveContext() throws Exception { AgentSpan parentSpan = AgentTracer.startSpan("test", "parent"); try (AgentScope ignored1 = AgentTracer.activateSpan(parentSpan)) { - try (ContextScope ignored2 = LLMObsContext.attach(parentSpan.context(), expectedSessionId)) { + try (ContextScope ignored2 = + LLMObsContext.attach(parentSpan.spanContext(), expectedSessionId)) { try { openAiClient.chat().completions().create(buildMinimalChatParams()); } catch (Exception ignored) { diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java index 1920f28553c..66590e18cc2 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelSpan.java @@ -112,7 +112,7 @@ public void end(final EndSpanOptions endOptions) { @Override public SpanContext getContext() { - return converter.toSpanContext(delegate.context()); + return converter.toSpanContext(delegate.spanContext()); } @Override diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracer.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracer.java index 5d4bccb6244..529ec13aa65 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracer.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelTracer.java @@ -58,7 +58,7 @@ public SpanBuilder(final String spanName) { @Override public Span.Builder setParent(final Span parent) { parentSet = true; - delegate.asChildOf(converter.toAgentSpan(parent).context()); + delegate.asChildOf(converter.toAgentSpan(parent).spanContext()); return this; } @@ -163,7 +163,7 @@ public Span.Builder setStartTimestamp(final long startTimestamp) { @Override public Span startSpan() { final AgentSpan agentSpan = delegate.start(); - agentSpan.context().setIntegrationName("otel"); + agentSpan.spanContext().setIntegrationName("otel"); return converter.toSpan(agentSpan); } } diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy index 3f24dad8eb5..62f315e6191 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/OpenTelemetryTest.groovy @@ -82,7 +82,7 @@ class OpenTelemetryTest extends InstrumentationSpecification { } defaultTags() } - assert span.context().integrationName == "otel" + assert span.spanContext().integrationName == "otel" } } } diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java index 847e4b16e71..9115cd1d046 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/OpenTelemetry14Test.java @@ -590,7 +590,7 @@ void testIntegrationName() throws Exception { writer.waitForTraces(1); DDSpan ddSpan = writer.firstTrace().get(0); - assertEquals("otel", ddSpan.context().getIntegrationName().toString()); + assertEquals("otel", ddSpan.spanContext().getIntegrationName().toString()); } static Stream testSpanKindsArguments() { diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpan.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpan.java index fcdb7b759dc..e33c98fb54f 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpan.java +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTSpan.java @@ -30,7 +30,7 @@ class OTSpan implements Span, MutableSpan, WithAgentSpan, SpanWrapper { @Override public SpanContext context() { - return converter.toSpanContext(delegate.context()); + return converter.toSpanContext(delegate.spanContext()); } @Override diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTracer.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTracer.java index 1a121799024..32f62c86832 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTracer.java +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTTracer.java @@ -89,7 +89,7 @@ public Tracer.SpanBuilder asChildOf(final SpanContext parent) { @Override public Tracer.SpanBuilder asChildOf(final Span parent) { if (parent != null) { - delegate.asChildOf(converter.toAgentSpan(parent).context()); + delegate.asChildOf(converter.toAgentSpan(parent).spanContext()); } return this; } @@ -151,14 +151,14 @@ public Span startManual() { @Override public Span start() { final AgentSpan agentSpan = delegate.start(); - agentSpan.context().setIntegrationName("opentracing"); + agentSpan.spanContext().setIntegrationName("opentracing"); return converter.toSpan(agentSpan); } @Override public Scope startActive(final boolean finishSpanOnClose) { final AgentSpan agentSpan = delegate.start(); - agentSpan.context().setIntegrationName("opentracing"); + agentSpan.spanContext().setIntegrationName("opentracing"); return converter.toScope(tracer.activateManualSpan(agentSpan), finishSpanOnClose); } } diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/OpenTracing31Test.groovy b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/OpenTracing31Test.groovy index 2c41794bcaa..8080a809009 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/OpenTracing31Test.groovy +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/OpenTracing31Test.groovy @@ -112,7 +112,7 @@ class OpenTracing31Test extends InstrumentationSpecification { } defaultTags(addReference != null) } - assert span.context().integrationName == "opentracing" + assert span.spanContext().integrationName == "opentracing" } } } diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpan.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpan.java index 8fd4213eb16..b8e60b6b4b7 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpan.java +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTSpan.java @@ -31,7 +31,7 @@ class OTSpan implements Span, MutableSpan, WithAgentSpan, SpanWrapper { @Override public SpanContext context() { - return converter.toSpanContext(delegate.context()); + return converter.toSpanContext(delegate.spanContext()); } @Override diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTracer.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTracer.java index ab4e2ebea92..ba2ce8313c0 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTracer.java +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTTracer.java @@ -105,7 +105,7 @@ public Tracer.SpanBuilder asChildOf(final SpanContext parent) { @Override public Tracer.SpanBuilder asChildOf(final Span parent) { if (parent != null) { - delegate.asChildOf(converter.toAgentSpan(parent).context()); + delegate.asChildOf(converter.toAgentSpan(parent).spanContext()); } return this; } @@ -173,14 +173,14 @@ public Span startManual() { @Override public Span start() { final AgentSpan agentSpan = delegate.start(); - agentSpan.context().setIntegrationName("opentracing"); + agentSpan.spanContext().setIntegrationName("opentracing"); return converter.toSpan(agentSpan); } @Override public Scope startActive(final boolean finishSpanOnClose) { final AgentSpan agentSpan = delegate.start(); - agentSpan.context().setIntegrationName("opentracing"); + agentSpan.spanContext().setIntegrationName("opentracing"); return converter.toScope(tracer.activateManualSpan(agentSpan), finishSpanOnClose); } } diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/OpenTracing32Test.groovy b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/OpenTracing32Test.groovy index e262f947a14..99aaddfe1e0 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/OpenTracing32Test.groovy +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/OpenTracing32Test.groovy @@ -118,7 +118,7 @@ class OpenTracing32Test extends InstrumentationSpecification { } defaultTags(addReference != null) } - assert span.context().integrationName == "opentracing" + assert span.spanContext().integrationName == "opentracing" } } } diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java index 78703cf9790..8f8a734cf13 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitDecorator.java @@ -204,7 +204,7 @@ public static AgentScope startReceivingSpan( String queue) { final Map headers = propagate && null != properties ? properties.getHeaders() : null; - AgentSpanContext parentContext = + AgentSpanContext parentSpanContext = null != headers ? extractContextAndGetSpanContext(headers, ContextVisitors.objectValuesMap()) : null; @@ -226,17 +226,18 @@ public static AgentScope startReceivingSpan( startSpan( RABBITMQ_AMQP.toString(), OPERATION_AMQP_DELIVER, - parentContext, + parentSpanContext, TimeUnit.MILLISECONDS.toMicros(queueStartMillis)); BROKER_DECORATE.afterStart(queueSpan); BROKER_DECORATE.onTimeInQueue(queueSpan, queue, body); - parentContext = queueSpan.context(); + parentSpanContext = queueSpan.spanContext(); BROKER_DECORATE.beforeFinish(queueSpan); // The queueSpan will be finished after the inner span has been activated to ensure that the // spans are written out together by the TraceStructureWriter when running in strict mode } final AgentSpan span = - startSpan(RABBITMQ_AMQP.toString(), OPERATION_AMQP_INBOUND, parentContext, spanStartMicros); + startSpan( + RABBITMQ_AMQP.toString(), OPERATION_AMQP_INBOUND, parentSpanContext, spanStartMicros); if (null != body) { span.setTag("message.size", body.length); diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java index e18502fa092..dadbb510029 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java +++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/src/main/java/datadog/trace/instrumentation/rxjava/TracedOnSubscribe.java @@ -35,7 +35,8 @@ protected String instrumentationName() { @Override public void call(final Subscriber subscriber) { final AgentSpan span = - startSpan(instrumentationName(), operationName, parent != null ? parent.context() : null); + startSpan( + instrumentationName(), operationName, parent != null ? parent.spanContext() : null); afterStart(span); try (final AgentScope scope = activateSpan(span)) { diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/latestDepTest/groovy/ScalaInstrumentationTest.groovy b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/latestDepTest/groovy/ScalaInstrumentationTest.groovy index 1f18e42508a..dfc848ec74e 100644 --- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/latestDepTest/groovy/ScalaInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/latestDepTest/groovy/ScalaInstrumentationTest.groovy @@ -19,10 +19,10 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { expect: trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "ScalaConcurrentTests.traceWithFutureAndCallbacks" - findSpan(trace, "goodFuture").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "badFuture").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "good complete").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "bad complete").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "goodFuture").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "badFuture").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "good complete").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "bad complete").spanContext().getParentId() == trace[0].spanContext().getSpanId() } def "scala propagates across futures with no traces"() { @@ -35,7 +35,7 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { expect: trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "ScalaConcurrentTests.tracedAcrossThreadsWithNoTrace" - findSpan(trace, "callback").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "callback").spanContext().getParentId() == trace[0].spanContext().getSpanId() } def "scala either promise completion"() { @@ -49,9 +49,9 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { TEST_WRITER.size() == 1 trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "ScalaConcurrentTests.traceWithPromises" - findSpan(trace, "keptPromise").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "keptPromise2").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "brokenPromise").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "keptPromise").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "keptPromise2").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "brokenPromise").spanContext().getParentId() == trace[0].spanContext().getSpanId() } def "scala first completed future"() { @@ -64,9 +64,9 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { expect: TEST_WRITER.size() == 1 trace.size() == expectedNumberOfSpans - findSpan(trace, "timeout1").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "timeout2").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "timeout3").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "timeout1").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "timeout2").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "timeout3").spanContext().getParentId() == trace[0].spanContext().getSpanId() } private DDSpan findSpan(List trace, String opName) { diff --git a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/groovy/ScalaInstrumentationTest.groovy b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/groovy/ScalaInstrumentationTest.groovy index 1f18e42508a..dfc848ec74e 100644 --- a/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/groovy/ScalaInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/scala/scala-concurrent-2.8/src/test/groovy/ScalaInstrumentationTest.groovy @@ -19,10 +19,10 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { expect: trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "ScalaConcurrentTests.traceWithFutureAndCallbacks" - findSpan(trace, "goodFuture").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "badFuture").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "good complete").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "bad complete").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "goodFuture").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "badFuture").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "good complete").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "bad complete").spanContext().getParentId() == trace[0].spanContext().getSpanId() } def "scala propagates across futures with no traces"() { @@ -35,7 +35,7 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { expect: trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "ScalaConcurrentTests.tracedAcrossThreadsWithNoTrace" - findSpan(trace, "callback").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "callback").spanContext().getParentId() == trace[0].spanContext().getSpanId() } def "scala either promise completion"() { @@ -49,9 +49,9 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { TEST_WRITER.size() == 1 trace.size() == expectedNumberOfSpans trace[0].resourceName.toString() == "ScalaConcurrentTests.traceWithPromises" - findSpan(trace, "keptPromise").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "keptPromise2").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "brokenPromise").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "keptPromise").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "keptPromise2").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "brokenPromise").spanContext().getParentId() == trace[0].spanContext().getSpanId() } def "scala first completed future"() { @@ -64,9 +64,9 @@ class ScalaInstrumentationTest extends InstrumentationSpecification { expect: TEST_WRITER.size() == 1 trace.size() == expectedNumberOfSpans - findSpan(trace, "timeout1").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "timeout2").context().getParentId() == trace[0].context().getSpanId() - findSpan(trace, "timeout3").context().getParentId() == trace[0].context().getSpanId() + findSpan(trace, "timeout1").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "timeout2").spanContext().getParentId() == trace[0].spanContext().getSpanId() + findSpan(trace, "timeout3").spanContext().getParentId() == trace[0].spanContext().getSpanId() } private DDSpan findSpan(List trace, String opName) { diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java index afb9e2a0859..d1a2432d16d 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-3.0/src/main/java/datadog/trace/instrumentation/servlet3/AsyncContextInstrumentation.java @@ -98,7 +98,7 @@ public static boolean enter( } final AgentSpan span = - startSpan(JAVA_WEB_SERVLET_DISPATCHER.toString(), SERVLET_DISPATCH, parent.context()); + startSpan(JAVA_WEB_SERVLET_DISPATCHER.toString(), SERVLET_DISPATCH, parent.spanContext()); // This span should get finished by Servlet3Advice // However, when using Jetty without servlets (directly org.eclipse.jetty.server.Handler), // that's not the case (see jetty's HandleAdvice) diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java index f112ba27f41..60cf8a49c95 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/dispatcher/RequestDispatcherInstrumentation.java @@ -103,11 +103,11 @@ public static ContextScope start( final AgentSpanContext parent; if (servletSpan == null || (parentSpan != null && servletSpan.isSameTrace(parentSpan))) { // Use the parentSpan if the servletSpan is null or part of the same trace. - parent = parentSpan.context(); + parent = parentSpan.spanContext(); } else { // parentSpan is part of a different trace, so lets ignore it. // This can happen with the way Tomcat does error handling. - parent = servletSpan.context(); + parent = servletSpan.spanContext(); } final AgentSpan span = diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java index 817aa1f0d84..33299fb944d 100644 --- a/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java +++ b/dd-java-agent/instrumentation/spark/spark-common/src/main/java/datadog/trace/instrumentation/spark/AbstractDatadogSparkListener.java @@ -478,12 +478,12 @@ private AgentSpan getOrCreateSqlSpan( if (batchKey != null) { AgentSpan batchSpan = getOrCreateStreamingBatchSpan(batchKey, queryStart.time(), jobProperties); - spanBuilder.asChildOf(batchSpan.context()); + spanBuilder.asChildOf(batchSpan.spanContext()); } else if (isRunningOnDatabricks) { addDatabricksSpecificTags(spanBuilder, jobProperties, true); } else { initApplicationSpanIfNotInitialized(); - spanBuilder.asChildOf(applicationSpan.context()); + spanBuilder.asChildOf(applicationSpan.spanContext()); } AgentSpan sqlSpan = spanBuilder.start(); @@ -523,18 +523,18 @@ public synchronized void onJobStart(SparkListenerJobStart jobStart) { * spark.job */ if (sqlSpan != null) { - jobSpanBuilder.asChildOf(sqlSpan.context()); + jobSpanBuilder.asChildOf(sqlSpan.spanContext()); } else if (batchKey != null) { isStreamingJob = true; AgentSpan batchSpan = getOrCreateStreamingBatchSpan(batchKey, jobStart.time(), jobStart.properties()); - jobSpanBuilder.asChildOf(batchSpan.context()); + jobSpanBuilder.asChildOf(batchSpan.spanContext()); } else if (isRunningOnDatabricks) { addDatabricksSpecificTags(jobSpanBuilder, jobStart.properties(), true); } else { // In non-databricks, non-streaming env, the spark application is the local root span initApplicationSpanIfNotInitialized(); - jobSpanBuilder.asChildOf(applicationSpan.context()); + jobSpanBuilder.asChildOf(applicationSpan.spanContext()); } jobSpanBuilder.withTag(DDTags.RESOURCE_NAME, getSparkJobName(jobStart)); @@ -623,7 +623,7 @@ public synchronized void onStageSubmitted(SparkListenerStageSubmitted stageSubmi AgentSpan stageSpan = buildSparkSpan("spark.stage", stageSubmitted.properties()) - .asChildOf(jobSpan.context()) + .asChildOf(jobSpan.spanContext()) .withStartTimestamp(submissionTimeMs * 1000) .withTag("stage_id", stageId) .withTag( @@ -778,7 +778,7 @@ private void sendTaskSpan( AgentSpan stageSpan, SparkListenerTaskEnd taskEnd, Properties properties) { AgentSpan taskSpan = buildSparkSpan("spark.task", properties) - .asChildOf(stageSpan.context()) + .asChildOf(stageSpan.spanContext()) .withStartTimestamp(taskEnd.taskInfo().launchTime() * 1000) .withTag("task_id", taskEnd.taskInfo().taskId()) .withTag("task_attempt_id", taskEnd.taskInfo().attemptNumber()) diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkStructuredStreamingTest.groovy b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkStructuredStreamingTest.groovy index ebad7aec0bd..21698955136 100644 --- a/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkStructuredStreamingTest.groovy +++ b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkStructuredStreamingTest.groovy @@ -92,8 +92,8 @@ class AbstractSparkStructuredStreamingTest extends InstrumentationSpecification resourceName "test-query" spanType "spark" parent() - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() tags { defaultTags() // Streaming tags @@ -201,8 +201,8 @@ class AbstractSparkStructuredStreamingTest extends InstrumentationSpecification operationName "spark.streaming_batch" spanType "spark" assert span.tags["streaming_query.batch_id"] == 1 - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() parent() } span { diff --git a/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy index 95748c054d3..f311d437a84 100644 --- a/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy +++ b/dd-java-agent/instrumentation/spark/spark-common/src/testFixtures/groovy/datadog/trace/instrumentation/spark/AbstractSparkTest.groovy @@ -58,9 +58,9 @@ abstract class AbstractSparkTest extends InstrumentationSpecification { resourceName "spark.application" spanType "spark" errored false - assert span.context().getTraceId() != DDTraceId.ZERO - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getTraceId() != DDTraceId.ZERO + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() parent() } span { @@ -363,8 +363,8 @@ abstract class AbstractSparkTest extends InstrumentationSpecification { spanType "spark" traceId 8944764253919609482G parentSpanId 15104224823446433673G - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() assert span.tags["databricks_job_id"] == "1234" assert span.tags["databricks_job_run_id"] == "5678" assert span.tags["databricks_task_run_id"] == "9012" @@ -386,8 +386,8 @@ abstract class AbstractSparkTest extends InstrumentationSpecification { spanType "spark" traceId 5240384461065211484G parentSpanId 14128229261586201946G - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() assert span.tags["databricks_job_id"] == "3456" assert span.tags["databricks_job_run_id"] == "901" assert span.tags["databricks_task_run_id"] == "7890" @@ -409,8 +409,8 @@ abstract class AbstractSparkTest extends InstrumentationSpecification { spanType "spark" traceId 2235374731114184741G parentSpanId 8956125882166502063G - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() assert span.tags["databricks_job_id"] == "123" assert span.tags["databricks_job_run_id"] == "8765" assert span.tags["databricks_task_run_id"] == "456" @@ -431,8 +431,8 @@ abstract class AbstractSparkTest extends InstrumentationSpecification { operationName "spark.job" spanType "spark" parent() - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() assert span.tags["databricks_job_id"] == null assert span.tags["databricks_job_run_id"] == "8765" assert span.tags["databricks_task_run_id"] == null @@ -590,8 +590,8 @@ abstract class AbstractSparkTest extends InstrumentationSpecification { spanType "spark" traceId 8944764253919609482G parentSpanId 15104224823446433673G - assert span.context().getSamplingPriority() == PrioritySampling.USER_KEEP - assert span.context().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() + assert span.spanContext().getSamplingPriority() == PrioritySampling.USER_KEEP + assert span.spanContext().getPropagationTags().createTagMap()["_dd.p.dm"] == (-SamplingMechanism.DATA_JOBS).toString() } span { operationName "spark.job" diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/groovy/datadog/trace/instrumentation/springsecurity5/SpringBootBasedTest.groovy b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/groovy/datadog/trace/instrumentation/springsecurity5/SpringBootBasedTest.groovy index 8e869deb22c..15cb8cab358 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/groovy/datadog/trace/instrumentation/springsecurity5/SpringBootBasedTest.groovy +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-5.0/src/test/groovy/datadog/trace/instrumentation/springsecurity5/SpringBootBasedTest.groovy @@ -279,7 +279,7 @@ class SpringBootBasedTest extends AppSecHttpServerTest key.startsWith('appsec.events.users.login') }.isEmpty() // single call to the appender 1 * appender.doAppend(_) >> { diff --git a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/groovy/datadog/trace/instrumentation/springsecurity6/SpringBootBasedTest.groovy b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/groovy/datadog/trace/instrumentation/springsecurity6/SpringBootBasedTest.groovy index d7e17fb8051..902cf1786b8 100644 --- a/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/groovy/datadog/trace/instrumentation/springsecurity6/SpringBootBasedTest.groovy +++ b/dd-java-agent/instrumentation/spring/spring-security/spring-security-6.0/src/test/groovy/datadog/trace/instrumentation/springsecurity6/SpringBootBasedTest.groovy @@ -254,7 +254,7 @@ class SpringBootBasedTest extends AppSecHttpServerTest key.startsWith('appsec.events.users.login')}.isEmpty() // single call to the appender 1 * appender.doAppend(_) >> { diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/latestDepTest/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/latestDepTest/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy index c4a179c1b44..8c0a93a178a 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/latestDepTest/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/latestDepTest/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy @@ -39,7 +39,7 @@ class HandlerMappingResourceNameFilterForkedTest extends InstrumentationSpecific when: runUnderTrace("test-servlet", { - request.setAttribute(DD_CONTEXT_ATTRIBUTE, activeSpan().context()) + request.setAttribute(DD_CONTEXT_ATTRIBUTE, activeSpan().spanContext()) filter.doFilterInternal(request, response, filterChain) }) diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy index c4a179c1b44..8c0a93a178a 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/groovy/datadog/trace/instrumentation/springweb/HandlerMappingResourceNameFilterForkedTest.groovy @@ -39,7 +39,7 @@ class HandlerMappingResourceNameFilterForkedTest extends InstrumentationSpecific when: runUnderTrace("test-servlet", { - request.setAttribute(DD_CONTEXT_ATTRIBUTE, activeSpan().context()) + request.setAttribute(DD_CONTEXT_ATTRIBUTE, activeSpan().spanContext()) filter.doFilterInternal(request, response, filterChain) }) diff --git a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java index dc605dbd9d0..e81d069d1dc 100644 --- a/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java +++ b/dd-java-agent/instrumentation/synapse-3.0/src/main/java/datadog/trace/instrumentation/synapse3/SynapseClientInstrumentation.java @@ -87,7 +87,7 @@ public static ContextScope beginRequest( AgentSpan span; if (null != parentSpan) { - span = startSpan(SYNAPSE_CLIENT.toString(), SYNAPSE_REQUEST, parentSpan.context()); + span = startSpan(SYNAPSE_CLIENT.toString(), SYNAPSE_REQUEST, parentSpan.spanContext()); } else { span = startSpan(SYNAPSE_CLIENT.toString(), SYNAPSE_REQUEST); } diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java index 9d64a23fad7..c4b3ca071a4 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-5.14/src/main/java/datadog/trace/instrumentation/tibcobw5/TaskInstrumentation.java @@ -68,7 +68,7 @@ public static boolean before( AgentSpan parent = map.getOrDefault(ddActivityInfo.parent, activeSpan()); span = startSpan( - "tibco_bw", TIBCO_ACTIVITY_OPERATION, parent != null ? parent.context() : null); + "tibco_bw", TIBCO_ACTIVITY_OPERATION, parent != null ? parent.spanContext() : null); DECORATE.afterStart(span); DECORATE.onActivityStart(span, ddActivityInfo.name); map.put(ddActivityInfo.id, span); diff --git a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java index c6d968bc7ca..b0d7f8fbd33 100644 --- a/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java +++ b/dd-java-agent/instrumentation/tibco-businessworks/tibco-businessworks-6.5/src/main/java/datadog/trace/instrumentation/tibcobw6/BehaviorInstrumentation.java @@ -93,7 +93,7 @@ public static AgentScope activityBegin( startSpan( "tibco_bw", TibcoDecorator.TIBCO_ACTIVITY_OPERATION, - parentSpan != null ? parentSpan.context() : null); + parentSpan != null ? parentSpan.spanContext() : null); TibcoDecorator.DECORATE.afterStart(span); TibcoDecorator.DECORATE.onActivityStart(span, pmTask.getName(pmContext)); return activateSpan(span); @@ -144,7 +144,7 @@ public static void processStarts( startSpan( "tibco_bw", TibcoDecorator.TIBCO_PROCESS_OPERATION, - parent != null ? parentSpan.context() : null); + parent != null ? parentSpan.spanContext() : null); TibcoDecorator.DECORATE.afterStart(span); TibcoDecorator.DECORATE.onProcessStart(span, pmProcessInstance.getName(pmContext)); contextStore.put(pmProcessInstance, span); diff --git a/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java b/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java index 15b66a664d9..08379c059c4 100644 --- a/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java +++ b/dd-java-agent/instrumentation/tinylog-2.0/src/main/java/datadog/trace/instrumentation/tinylog2/TinylogLoggingProviderInstrumentation.java @@ -54,7 +54,7 @@ public static void onEnter(@Advice.Argument(0) LogEntry event) { if (span != null && traceConfig(span).isLogsInjectionEnabled()) { InstrumentationContext.get(LogEntry.class, AgentSpanContext.class) - .put(event, span.context()); + .put(event, span.spanContext()); } } } diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java index 6a9375ca9ea..d95a6c65137 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java +++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/VertxSqlClientDecorator.java @@ -100,7 +100,7 @@ public AgentSpan startAndDecorateSpanForStatement( span.setResourceName(DB_QUERY); } span.setTag(Tags.COMPONENT, component); - span.context().setIntegrationName(component); + span.spanContext().setIntegrationName(component); return span; } diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/test/groovy/WebsocketTest.groovy b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/test/groovy/WebsocketTest.groovy index b1ab4fc252c..f0b1170737e 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/test/groovy/WebsocketTest.groovy +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/test/groovy/WebsocketTest.groovy @@ -582,7 +582,7 @@ class WebsocketTest extends InstrumentationSpecification { def clientHandshake = createHandshakeSpan("http.request", url) //simulate client span clientHandshake.setSamplingPriority(PrioritySampling.SAMPLER_DROP) // simulate sampler drop def serverHandshake = createHandshakeSpan("servlet.request", url, - new ExtractedContext(clientHandshake.context().getTraceId(), clientHandshake.context().getSpanId(), clientHandshake.context().getSamplingPriority(), + new ExtractedContext(clientHandshake.spanContext().getTraceId(), clientHandshake.spanContext().getSpanId(), clientHandshake.spanContext().getSamplingPriority(), "test", 0, ["example_baggage": "test"], TagMap.EMPTY, null, null, null, null)) // simulate server span def session = deployEndpointAndConnect(new Endpoints.TestEndpoint(new Endpoints.FullStringHandler()), clientHandshake, serverHandshake, url) @@ -626,8 +626,8 @@ class WebsocketTest extends InstrumentationSpecification { // check that the handshake trace state is inherited TEST_WRITER.flatten().findAll { span -> (span as DDSpan).getSpanType() == "websocket" && (span as DDSpan).getParentId() == 0}.each { assert (it as DDSpan).getSamplingPriority() == serverHandshake.getSamplingPriority() - assert (it as DDSpan).getOrigin() == serverHandshake.context().getOrigin() - assert (it as DDSpan).getBaggage() == serverHandshake.context().getBaggageItems() + assert (it as DDSpan).getOrigin() == serverHandshake.spanContext().getOrigin() + assert (it as DDSpan).getBaggage() == serverHandshake.spanContext().getBaggageItems() assert !(it as DDSpan).getBaggage().isEmpty() } } diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/LinksAssert.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/LinksAssert.groovy index 3d583398cac..2f560469de0 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/LinksAssert.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/LinksAssert.groovy @@ -32,7 +32,7 @@ class LinksAssert { } def link(DDSpan linked, byte flags = SpanLink.DEFAULT_FLAGS, SpanAttributes attributes = SpanAttributes.EMPTY, String traceState = '') { - link(linked.context(), flags, attributes, traceState) + link(linked.spanContext(), flags, attributes, traceState) } def link(AgentSpanContext context, byte flags = SpanLink.DEFAULT_FLAGS, SpanAttributes attributes = SpanAttributes.EMPTY, String traceState = '') { diff --git a/dd-trace-core/src/main/java/datadog/trace/common/writer/DDSpanJsonAdapter.java b/dd-trace-core/src/main/java/datadog/trace/common/writer/DDSpanJsonAdapter.java index 93c6995d4e8..c1e5cb4db1c 100644 --- a/dd-trace-core/src/main/java/datadog/trace/common/writer/DDSpanJsonAdapter.java +++ b/dd-trace-core/src/main/java/datadog/trace/common/writer/DDSpanJsonAdapter.java @@ -75,7 +75,7 @@ public void toJson(final com.squareup.moshi.JsonWriter writer, final DDSpan span writer.name("meta"); writer.beginObject(); final Map tags = span.getTags(); - for (final Map.Entry entry : span.context().getBaggageItems().entrySet()) { + for (final Map.Entry entry : span.spanContext().getBaggageItems().entrySet()) { if (!tags.containsKey(entry.getKey())) { writer.name(entry.getKey()); writer.value(entry.getValue()); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java index 375480a8792..59325f25632 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java @@ -1289,7 +1289,7 @@ void write(final SpanList trace) { boolean forceKeep = metricsAggregator.publish(writtenTrace); - TraceCollector traceCollector = writtenTrace.get(0).context().getTraceCollector(); + TraceCollector traceCollector = writtenTrace.get(0).spanContext().getTraceCollector(); traceCollector.setSamplingPriorityIfNecessary(); DDSpan rootSpan = traceCollector.getRootSpan(); @@ -1542,9 +1542,9 @@ public TraceSegment getTraceSegment() { if (activeSpan == null) { return null; } - AgentSpanContext ctx = activeSpan.context(); - if (ctx instanceof DDSpanContext) { - return ((DDSpanContext) ctx).getTraceSegment(); + AgentSpanContext spanContext = activeSpan.spanContext(); + if (spanContext instanceof DDSpanContext) { + return ((DDSpanContext) spanContext).getTraceSegment(); } return null; } @@ -1616,7 +1616,7 @@ protected static final DDSpan buildSpan( String serviceName, CharSequence operationName, String resourceName, - AgentSpanContext resolvedParentContext, + AgentSpanContext resolvedParentSpanContext, boolean ignoreScope, boolean errorFlag, CharSequence spanType, @@ -1636,7 +1636,7 @@ protected static final DDSpan buildSpan( serviceName, operationName, resourceName, - resolvedParentContext, + resolvedParentSpanContext, errorFlag, spanType, tagLedger, @@ -1662,30 +1662,30 @@ protected static final DDSpan buildSpanImpl( return span; } - private static final List addParentContextLink( - List links, AgentSpanContext parentContext) { + private static final List addParentSpanLink( + List links, AgentSpanContext parentSpanContext) { SpanLink link; - if (parentContext instanceof ExtractedContext) { - String headers = ((ExtractedContext) parentContext).getPropagationStyle().toString(); + if (parentSpanContext instanceof ExtractedContext) { + String headers = ((ExtractedContext) parentSpanContext).getPropagationStyle().toString(); SpanAttributes attributes = SpanAttributes.builder() .put("reason", "propagation_behavior_extract") .put("context_headers", headers) .build(); - link = DDSpanLink.from((ExtractedContext) parentContext, attributes); + link = DDSpanLink.from((ExtractedContext) parentSpanContext, attributes); } else { - link = SpanLink.from(parentContext); + link = SpanLink.from(parentSpanContext); } return addLink(links, link); } - protected static final List addTerminatedContextAsLinks( - List links, AgentSpanContext parentContext) { - if (parentContext instanceof TagContext) { - List terminatedContextLinks = - ((TagContext) parentContext).getTerminatedContextLinks(); - if (!terminatedContextLinks.isEmpty()) { - return addLinks(links, terminatedContextLinks); + protected static final List addTerminatedSpanAsLinks( + List links, AgentSpanContext parentSpanContext) { + if (parentSpanContext instanceof TagContext) { + List terminatedSpanLinks = + ((TagContext) parentSpanContext).getTerminatedSpanLinks(); + if (!terminatedSpanLinks.isEmpty()) { + return addLinks(links, terminatedSpanLinks); } } return links; @@ -1735,7 +1735,7 @@ protected static final AgentSpan startSpan( final CoreTracer tracer, String instrumentationName, CharSequence operationName, - AgentSpanContext specifiedParentContext, + AgentSpanContext specifiedParentSpanContext, boolean ignoreScope, long timestampMicros) { return startSpan( @@ -1746,7 +1746,7 @@ protected static final AgentSpan startSpan( null /* serviceName */, operationName, null /* resourceName */, - specifiedParentContext, + specifiedParentSpanContext, ignoreScope, false /* errorFlag */, null /* spanType */, @@ -1765,7 +1765,7 @@ protected static final AgentSpan startSpan( String serviceName, CharSequence operationName, String resourceName, - AgentSpanContext specifiedParentContext, + AgentSpanContext specifiedParentSpanContext, boolean ignoreScope, boolean errorFlag, CharSequence spanType, @@ -1775,34 +1775,34 @@ protected static final AgentSpan startSpan( Object builderRequestContextDataIast, Object builderCiVisibilityContextData) { // Find the parent context - AgentSpanContext parentContext = specifiedParentContext; - if (parentContext == null && !ignoreScope) { + AgentSpanContext parentSpanContext = specifiedParentSpanContext; + if (parentSpanContext == null && !ignoreScope) { // use the Scope as parent unless overridden or ignored. final AgentSpan activeSpan = tracer.scopeManager.activeSpan(); if (activeSpan != null) { - parentContext = activeSpan.context(); + parentSpanContext = activeSpan.spanContext(); } } - if (parentContext == BlackHoleSpan.Context.INSTANCE) { - return new BlackHoleSpan(parentContext.getTraceId()); + if (parentSpanContext == BlackHoleSpan.Context.INSTANCE) { + return new BlackHoleSpan(parentSpanContext.getTraceId()); } - // Handle remote terminated context as span links - if (parentContext != null && parentContext.isRemote()) { + // Handle remote terminated span context as span links + if (parentSpanContext != null && parentSpanContext.isRemote()) { switch (Config.get().getTracePropagationBehaviorExtract()) { case RESTART: - links = addParentContextLink(links, parentContext); - parentContext = null; + links = addParentSpanLink(links, parentSpanContext); + parentSpanContext = null; break; case IGNORE: - parentContext = null; + parentSpanContext = null; break; case CONTINUE: default: - links = addTerminatedContextAsLinks(links, specifiedParentContext); + links = addTerminatedSpanAsLinks(links, specifiedParentSpanContext); break; } } @@ -1815,7 +1815,7 @@ protected static final AgentSpan startSpan( serviceName, operationName, resourceName, - parentContext, + parentSpanContext, ignoreScope, errorFlag, spanType, @@ -1880,7 +1880,7 @@ public final CoreSpanBuilder asChildOf(final AgentSpanContext spanContext) { } public final CoreSpanBuilder asChildOf(final AgentSpan agentSpan) { - parent = agentSpan.context(); + parent = agentSpan.spanContext(); return this; } @@ -1954,7 +1954,7 @@ protected static final DDSpanContext buildSpanContext( String serviceName, CharSequence operationName, String resourceName, - AgentSpanContext resolvedParentContext, + AgentSpanContext resolvedParentSpanContext, boolean errorFlag, CharSequence spanType, TagMap.Ledger tagLedger, @@ -1988,9 +1988,9 @@ protected static final DDSpanContext buildSpanContext( CharSequence serviceNameSource = MANUAL; // Propagate internal trace. // Note: if we are not in the context of distributed tracing, and we are starting the first - // root span, parentContext will be null at this point. - if (resolvedParentContext instanceof DDSpanContext) { - final DDSpanContext ddsc = (DDSpanContext) resolvedParentContext; + // root span, parentSpanContext will be null at this point. + if (resolvedParentSpanContext instanceof DDSpanContext) { + final DDSpanContext ddsc = (DDSpanContext) resolvedParentSpanContext; traceId = ddsc.getTraceId(); parentSpanId = ddsc.getSpanId(); baggage = ddsc.getBaggageItems(); @@ -2007,7 +2007,8 @@ protected static final DDSpanContext buildSpanContext( if (serviceName == null) { serviceName = parentServiceName; } - RequestContext requestContext = ((DDSpanContext) resolvedParentContext).getRequestContext(); + RequestContext requestContext = + ((DDSpanContext) resolvedParentSpanContext).getRequestContext(); if (requestContext != null) { requestContextDataAppSec = requestContext.getData(RequestContextSlot.APPSEC); requestContextDataIast = requestContext.getData(RequestContextSlot.IAST); @@ -2021,21 +2022,21 @@ protected static final DDSpanContext buildSpanContext( } else { long endToEndStartTime; - if (resolvedParentContext instanceof ExtractedContext) { + if (resolvedParentSpanContext instanceof ExtractedContext) { // Propagate external trace - final ExtractedContext extractedContext = (ExtractedContext) resolvedParentContext; + final ExtractedContext extractedContext = (ExtractedContext) resolvedParentSpanContext; traceId = extractedContext.getTraceId(); parentSpanId = extractedContext.getSpanId(); samplingPriority = extractedContext.getSamplingPriority(); endToEndStartTime = extractedContext.getEndToEndStartTime(); propagationTags = extractedContext.getPropagationTags(); - } else if (resolvedParentContext != null) { + } else if (resolvedParentSpanContext != null) { traceId = - resolvedParentContext.getTraceId() == DDTraceId.ZERO + resolvedParentSpanContext.getTraceId() == DDTraceId.ZERO ? tracer.idGenerationStrategy.generateTraceId() - : resolvedParentContext.getTraceId(); - parentSpanId = resolvedParentContext.getSpanId(); - samplingPriority = resolvedParentContext.getSamplingPriority(); + : resolvedParentSpanContext.getTraceId(); + parentSpanId = resolvedParentSpanContext.getSpanId(); + samplingPriority = resolvedParentSpanContext.getSamplingPriority(); endToEndStartTime = 0; propagationTags = tracer.propagationTagsFactory.empty(); } else { @@ -2050,8 +2051,8 @@ protected static final DDSpanContext buildSpanContext( ConfigSnapshot traceConfig; // Get header tags and set origin whether propagating or not. - if (resolvedParentContext instanceof TagContext) { - TagContext tc = (TagContext) resolvedParentContext; + if (resolvedParentSpanContext instanceof TagContext) { + TagContext tc = (TagContext) resolvedParentSpanContext; traceConfig = (ConfigSnapshot) tc.getTraceConfig(); coreTags = tc.getTags(); coreTagsNeedsIntercept = true; // maybe intercept isn't needed? @@ -2087,10 +2088,10 @@ protected static final DDSpanContext buildSpanContext( // Use parent pathwayContext if present and started pathwayContext = - resolvedParentContext != null - && resolvedParentContext.getPathwayContext() != null - && resolvedParentContext.getPathwayContext().isStarted() - ? resolvedParentContext.getPathwayContext() + resolvedParentSpanContext != null + && resolvedParentSpanContext.getPathwayContext() != null + && resolvedParentSpanContext.getPathwayContext().isStarted() + ? resolvedParentSpanContext.getPathwayContext() : tracer.dataStreamsMonitoring.newPathwayContext(); // when removing fake services the best upward service name to pick is the local root one diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java index 213f27825bf..ad46c7ecccc 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpan.java @@ -544,7 +544,7 @@ public U unsafeGetTag(CharSequence name) { @Override @Nonnull - public final DDSpanContext context() { + public final DDSpanContext spanContext() { return context; } @@ -967,7 +967,7 @@ public boolean isKind(SpanKindFilter filter) { @Override public void copyPropagationAndBaggage(final AgentSpan source) { if (source instanceof DDSpan) { - final DDSpanContext sourceSpanContext = ((DDSpan) source).context(); + final DDSpanContext sourceSpanContext = ((DDSpan) source).spanContext(); // align the sampling priority for this span context setSamplingPriority(sourceSpanContext.getSamplingPriority(), DEFAULT); // the sampling mechanism determine the dm tag hence we need to override and lock the current diff --git a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java index e7038db5dbe..520311a20c1 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java @@ -582,8 +582,8 @@ private DDSpanContext getRootSpanContextOrThis() { private DDSpanContext getRootSpanContextIfDifferent() { if (traceCollector != null) { final DDSpan rootSpan = traceCollector.getRootSpan(); - if (null != rootSpan && rootSpan.context() != this) { - return rootSpan.context(); + if (null != rootSpan && rootSpan.spanContext() != this) { + return rootSpan.spanContext(); } } return null; @@ -669,8 +669,8 @@ public boolean lockSamplingPriority() { // the priority is just CAS'd against UNSET/UNKNOWN, unless it's forced to USER_KEEP/MANUAL // but is maintained for backwards compatibility, and returns false when it used to final DDSpan rootSpan = traceCollector.getRootSpan(); - if (null != rootSpan && rootSpan.context() != this) { - return rootSpan.context().lockSamplingPriority(); + if (null != rootSpan && rootSpan.spanContext() != this) { + return rootSpan.spanContext().lockSamplingPriority(); } return SAMPLING_PRIORITY_UPDATER.get(this) != PrioritySampling.UNSET; diff --git a/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java b/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java index 11f8566cc48..04e97058aa0 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/PendingTrace.java @@ -493,7 +493,7 @@ public static long getDurationNano(CoreSpan span) { return duration; } DDSpan ddSpan = (DDSpan) span; - TraceCollector traceCollector = ddSpan.context().getTraceCollector(); + TraceCollector traceCollector = ddSpan.spanContext().getTraceCollector(); if (!(traceCollector instanceof PendingTrace)) { throw new IllegalArgumentException( "Expected " diff --git a/dd-trace-core/src/main/java/datadog/trace/core/TraceCollector.java b/dd-trace-core/src/main/java/datadog/trace/core/TraceCollector.java index 777fc3889bf..2d97e895fb0 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/TraceCollector.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/TraceCollector.java @@ -68,8 +68,9 @@ public void setSamplingPriorityIfNecessary() { // ASM. if ((!Config.get().isApmTracingEnabled() && !ProductTraceSource.isProductMarked( - rootSpan.context().getPropagationTags().getTraceSource(), ProductTraceSource.ASM)) - || rootSpan.context().getSamplingPriority() == PrioritySampling.UNSET) { + rootSpan.spanContext().getPropagationTags().getTraceSource(), + ProductTraceSource.ASM)) + || rootSpan.spanContext().getSamplingPriority() == PrioritySampling.UNSET) { ((PrioritySampler) traceConfig.sampler).setSamplingPriority(rootSpan); } } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java index 6a601a0e9de..114f2668790 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/baggage/BaggagePropagator.java @@ -129,7 +129,7 @@ public Context extract(Context context, C carrier, CarrierVisitor visitor // TODO: consider a better way to link baggage with the extracted (legacy) TagContext AgentSpan extractedSpan = AgentSpan.fromContext(context); if (extractedSpan != null) { - AgentSpanContext extractedSpanContext = extractedSpan.context(); + AgentSpanContext extractedSpanContext = extractedSpan.spanContext(); if (extractedSpanContext instanceof TagContext) { ((TagContext) extractedSpanContext).setW3CBaggage(baggage); } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsPropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsPropagator.java index 3aba15aca42..4258adce274 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsPropagator.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsPropagator.java @@ -43,7 +43,7 @@ public void inject(Context context, C carrier, CarrierSetter setter) { PathwayContext pathwayContext; DataStreamsContext dsmContext; if ((span = AgentSpan.fromContext(context)) == null - || (pathwayContext = span.context().getPathwayContext()) == null + || (pathwayContext = span.spanContext().getPathwayContext()) == null || (dsmContext = DataStreamsContext.fromContext(context)) == null || !traceConfig().isDataStreamsEnabled()) { return; @@ -97,7 +97,7 @@ private TagContext getSpanContextOrNull(Context context) { AgentSpan extractedSpan = AgentSpan.fromContext(context); AgentSpanContext extractedSpanContext; if (extractedSpan != null - && (extractedSpanContext = extractedSpan.context()) instanceof TagContext) { + && (extractedSpanContext = extractedSpan.spanContext()) instanceof TagContext) { return (TagContext) extractedSpanContext; } return null; diff --git a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java index 32db178bc1a..4cbc02acd37 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java @@ -262,7 +262,7 @@ public void mergePathwayContextIntoSpan(AgentSpan span, DataStreamsContextCarrie DataStreamsContextCarrierAdapter.INSTANCE, this.timeSource, getThreadServiceName()); - ((DDSpan) span).context().mergePathwayContext(pathwayContext); + ((DDSpan) span).spanContext().mergePathwayContext(pathwayContext); } } @@ -306,7 +306,7 @@ public void reportKafkaConfig( @Override public void setCheckpoint(AgentSpan span, DataStreamsContext context) { - PathwayContext pathwayContext = span.context().getPathwayContext(); + PathwayContext pathwayContext = span.spanContext().getPathwayContext(); if (pathwayContext != null) { pathwayContext.setCheckpoint(context, this::add); } diff --git a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProto.java b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProto.java index 5f317b40730..fa75f5c701d 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProto.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/otlp/trace/OtlpTraceProto.java @@ -86,7 +86,7 @@ public static int recordSpanMessage( MetaWriter metaWriter, int nestedSpanLinkBytes, OtlpProtoBuffer protobuf) { - PropagationTags propagationTags = span.context().getPropagationTags(); + PropagationTags propagationTags = span.spanContext().getPropagationTags(); writeTag(buf, 1, LEN_WIRE_TYPE); writeTraceId(buf, span.getTraceId()); @@ -109,7 +109,7 @@ public static int recordSpanMessage( if (span.samplingPriority() > 0) { traceFlags |= SAMPLED_TRACE_FLAG; } - if (span.context().isRemote()) { + if (span.spanContext().isRemote()) { traceFlags |= REMOTE_TRACE_FLAG; } if (traceFlags != NO_TRACE_FLAGS) { @@ -126,7 +126,7 @@ public static int recordSpanMessage( } writeTag(buf, 6, VARINT_WIRE_TYPE); - writeVarInt(buf, spanKind(span.context().getSpanKindString())); + writeVarInt(buf, spanKind(span.spanContext().getSpanKindString())); writeTag(buf, 7, I64_WIRE_TYPE); writeI64(buf, span.getStartTime()); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java index d98245b443a..38783860e9b 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java @@ -244,7 +244,7 @@ public TagContext extract( } } else { // Terminate extracted context and add it as span link - context.addTerminatedContextLink( + context.addTerminatedSpanLink( DDSpanLink.from( (ExtractedContext) extracted, SpanAttributes.builder() diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/TracingPropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/TracingPropagator.java index 89bb8ea5d59..f9267c355d7 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/TracingPropagator.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/TracingPropagator.java @@ -47,7 +47,7 @@ public void inject(Context context, C carrier, CarrierSetter setter) { || (span = fromContext(context)) == null) { return; } - AgentSpanContext spanContext = span.context(); + AgentSpanContext spanContext = span.spanContext(); if (spanContext instanceof DDSpanContext) { DDSpanContext ddSpanContext = (DDSpanContext) spanContext; // Stop injection if tracing is disabled and tracing span is coming from tracing only diff --git a/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayPropagator.java b/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayPropagator.java index 1a706306781..bffb5835bd9 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayPropagator.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/propagation/XRayPropagator.java @@ -43,7 +43,7 @@ public void inject(Context context, C carrier, CarrierSetter setter) { || (span = fromContext(context)) == null) { return; } - AgentSpanContext spanContext = span.context(); + AgentSpanContext spanContext = span.spanContext(); if (spanContext instanceof DDSpanContext) { DDSpanContext ddSpanContext = (DDSpanContext) spanContext; ddSpanContext.getTraceCollector().setSamplingPriorityIfNecessary(); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java index d4e7e332586..ba7e5288a68 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScope.java @@ -170,7 +170,7 @@ public final void beforeActivated() { return; } try { - scopeState.activate(span.context()); + scopeState.activate(span.spanContext()); } catch (Throwable e) { ContinuableScopeManager.ratelimitedLog.warn( "ScopeState {} threw exception in beforeActivated()", scopeState.getClass(), e); diff --git a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java index 5d997f87b39..53e4d5b7da6 100644 --- a/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java +++ b/dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ContinuableScopeManager.java @@ -122,7 +122,7 @@ public AgentScope.Continuation captureSpan(final AgentSpan span) { } private AgentScope.Continuation captureSpan(Context context, byte source, AgentSpan span) { - AgentTraceCollector traceCollector = span.context().getTraceCollector(); + AgentTraceCollector traceCollector = span.spanContext().getTraceCollector(); return new ScopeContinuation(this, context, source, traceCollector).register(); } @@ -357,8 +357,8 @@ private Stateful createScopeState(Context context) { // to encapsulate other scope lifecycle activities // FIXME DDSpanContext is always a ProfilerContext anyway... AgentSpan span = AgentSpan.fromContext(context); - if (span != null && span.context() instanceof ProfilerContext) { - return profilingContextIntegration.newScopeState((ProfilerContext) span.context()); + if (span != null && span.spanContext() instanceof ProfilerContext) { + return profilingContextIntegration.newScopeState((ProfilerContext) span.spanContext()); } return Stateful.DEFAULT; } diff --git a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceMapperTest.groovy b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceMapperTest.groovy index a81cee990c4..6f2173e8374 100644 --- a/dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceMapperTest.groovy +++ b/dd-trace-core/src/test/groovy/datadog/trace/common/writer/TraceMapperTest.groovy @@ -20,7 +20,7 @@ class TraceMapperTest extends DDCoreSpecification { DDSpan span = (DDSpan) tracer.buildSpan("datadog", null).withTag("service.name", "my-service") .withTag("elasticsearch.version", "7.0").start() span.setBaggageItem("baggage", "item") - span.context().setDataTop("mydata", "[1,2,3]") + span.spanContext().setDataTop("mydata", "[1,2,3]") def trace = [span] when: diff --git a/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptorTest.java index 42cb3a52843..a90c99fd854 100644 --- a/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/civisibility/interceptor/CiVisibilityTraceInterceptorTest.java @@ -52,7 +52,7 @@ void doNotDiscardATraceThatComesFromCiApp() { tracer.addTraceInterceptor(CiVisibilityTraceInterceptor.INSTANCE); DDSpan span = (DDSpan) tracer.buildSpan("datadog", "sample-span").start(); - span.context().setOrigin(CIConstants.CIAPP_TEST_ORIGIN); + span.spanContext().setOrigin(CIConstants.CIAPP_TEST_ORIGIN); span.finish(); // expect: @@ -72,7 +72,7 @@ void addTracerVersionToSpansOfType(@ConvertWith(DDSpanTypesConverter.class) Stri DDSpan span = (DDSpan) tracer.buildSpan("datadog", "sample-span").withSpanType(spanType).start(); - span.context().setOrigin(CIConstants.CIAPP_TEST_ORIGIN); + span.spanContext().setOrigin(CIConstants.CIAPP_TEST_ORIGIN); span.finish(); writer.waitForTraces(1); diff --git a/dd-trace-core/src/test/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSamplerTest.java b/dd-trace-core/src/test/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSamplerTest.java index 929a604aace..19369beeac9 100644 --- a/dd-trace-core/src/test/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSamplerTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/common/sampling/ParentBasedAlwaysOnSamplerTest.java @@ -70,7 +70,7 @@ void childSpanInheritsSamplingPriorityFromLocalParent() { DDSpan rootSpan = (DDSpan) tracer.buildSpan("datadog", "root").start(); sampler.setSamplingPriority(rootSpan); DDSpan childSpan = - (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.spanContext()).start(); try { assertEquals(SAMPLER_KEEP, rootSpan.getSamplingPriority()); assertEquals(SAMPLER_KEEP, childSpan.getSamplingPriority()); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java b/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java index 016b7ceda8f..000598ca7c9 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/CoreSpanBuilderTest.java @@ -118,14 +118,14 @@ void buildComplexSpan() { .withSpanType(expectedType) .start(); - DDSpanContext context = span.context(); - - assertEquals(expectedResource, context.getResourceName()); - assertTrue(context.getErrorFlag()); - assertEquals(expectedService, context.getServiceName()); - assertEquals(expectedType, context.getSpanType()); - assertEquals(Thread.currentThread().getName(), context.getTag(THREAD_NAME)); - assertEquals(Thread.currentThread().getId(), context.getTag(THREAD_ID)); + DDSpanContext spanContext = span.spanContext(); + + assertEquals(expectedResource, spanContext.getResourceName()); + assertTrue(spanContext.getErrorFlag()); + assertEquals(expectedService, spanContext.getServiceName()); + assertEquals(expectedType, spanContext.getSpanType()); + assertEquals(Thread.currentThread().getName(), spanContext.getTag(THREAD_NAME)); + assertEquals(Thread.currentThread().getId(), spanContext.getTag(THREAD_ID)); } @TableTest({ @@ -196,9 +196,9 @@ void shouldLinkToParentSpan() { .asChildOf(mockedContext) .start(); - DDSpanContext actualContext = span.context(); - assertEquals(expectedParentId, actualContext.getParentId()); - assertEquals(traceId, actualContext.getTraceId()); + DDSpanContext actualSpanContext = span.spanContext(); + assertEquals(expectedParentId, actualSpanContext.getParentId()); + assertEquals(traceId, actualSpanContext.getTraceId()); } @TableTest({ @@ -215,13 +215,13 @@ void shouldLinkToParentSpanImplicitly( noopParent ? noopSpan() : tracer.buildSpan("test", "parent").withServiceName("service").start())) { - long expectedParentId = noopParent ? DDSpanId.ZERO : parent.span().context().getSpanId(); + long expectedParentId = noopParent ? DDSpanId.ZERO : parent.span().spanContext().getSpanId(); DDSpan span = (DDSpan) tracer.buildSpan("test", "fakeName").withServiceName(serviceName).start(); - DDSpanContext actualContext = span.context(); - assertEquals(expectedParentId, actualContext.getParentId()); + DDSpanContext actualSpanContext = span.spanContext(); + assertEquals(expectedParentId, actualSpanContext.getParentId()); assertEquals(expectTopLevel, span.isTopLevel()); } } @@ -260,9 +260,9 @@ void shouldInheritTheDDParentAttributes() { assertEquals(expectedName, span.getOperationName()); assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey)); - assertEquals(expectedParentServiceName, span.context().getServiceName()); - assertEquals(expectedName, span.context().getResourceName()); - assertNull(span.context().getSpanType()); + assertEquals(expectedParentServiceName, span.spanContext().getServiceName()); + assertEquals(expectedName, span.spanContext().getResourceName()); + assertNull(span.spanContext().getSpanType()); assertTrue(span.isTopLevel()); // service names differ between parent and child // ServiceName and SpanType are always overwritten by the child if they are present @@ -278,9 +278,9 @@ void shouldInheritTheDDParentAttributes() { assertEquals(expectedName, span.getOperationName()); assertEquals(expectedBaggageItemValue, span.getBaggageItem(expectedBaggageItemKey)); - assertEquals(expectedChildServiceName, span.context().getServiceName()); - assertEquals(expectedChildResourceName, span.context().getResourceName()); - assertEquals(expectedChildType, span.context().getSpanType()); + assertEquals(expectedChildServiceName, span.spanContext().getServiceName()); + assertEquals(expectedChildResourceName, span.spanContext().getResourceName()); + assertEquals(expectedChildType, span.spanContext().getSpanType()); } @Test @@ -303,13 +303,15 @@ void shouldTrackAllSpansInTrace() { lastSpan.finish(); } - PendingTrace traceCollector = (PendingTrace) root.context().getTraceCollector(); + PendingTrace traceCollector = (PendingTrace) root.spanContext().getTraceCollector(); assertEquals(root, traceCollector.getRootSpan()); assertEquals(nbSamples, traceCollector.size()); assertTrue(traceCollector.getSpans().containsAll(spans)); DDSpan randomSpan = spans.get((int) (Math.random() * nbSamples)); assertTrue( - ((PendingTrace) randomSpan.context().getTraceCollector()).getSpans().containsAll(spans)); + ((PendingTrace) randomSpan.spanContext().getTraceCollector()) + .getSpans() + .containsAll(spans)); } static Stream extractedContextShouldPopulateNewSpanDetailsArguments() { @@ -351,13 +353,13 @@ void extractedContextShouldPopulateNewSpanDetails(ExtractedContext extractedCont assertEquals(extractedContext.getTraceId(), span.getTraceId()); assertEquals(extractedContext.getSpanId(), span.getParentId()); assertEquals(extractedContext.getSamplingPriority(), (int) span.getSamplingPriority()); - assertEquals(extractedContext.getOrigin(), span.context().getOrigin()); - assertEquals(extractedContext.getBaggage(), span.context().getBaggageItems()); + assertEquals(extractedContext.getOrigin(), span.spanContext().getOrigin()); + assertEquals(extractedContext.getBaggage(), span.spanContext().getBaggageItems()); assertEquals(thread.getId(), span.getTag(THREAD_ID)); assertEquals(thread.getName(), span.getTag(THREAD_NAME)); assertEquals( extractedContext.getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG), - span.context().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG)); + span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG)); } @Test @@ -434,8 +436,8 @@ void tagContextShouldPopulateDefaultSpanDetails( assertNotEquals(DDTraceId.ZERO, span.getTraceId()); assertEquals(DDSpanId.ZERO, span.getParentId()); assertNull(span.getSamplingPriority()); - assertEquals(tagContext.getOrigin(), span.context().getOrigin()); - assertEquals(Collections.emptyMap(), span.context().getBaggageItems()); + assertEquals(tagContext.getOrigin(), span.spanContext().getOrigin()); + assertEquals(Collections.emptyMap(), span.spanContext().getBaggageItems()); Map expectedTags = new HashMap<>(); if (tagContext.getTags() != null) { @@ -448,7 +450,7 @@ void tagContextShouldPopulateDefaultSpanDetails( expectedTags.put(PID_TAG, Config.get().getProcessId()); expectedTags.put(SCHEMA_VERSION_TAG_KEY, SpanNaming.instance().version()); expectedTags.putAll(productTags()); - assertEquals(expectedTags, span.context().getTags()); + assertEquals(expectedTags, span.spanContext().getTags()); } static Stream globalSpanTagsPopulatedOnEachSpanArguments() { @@ -495,7 +497,7 @@ void canOverwriteRequestContextDataWithBuilderFromEmpty() { AgentSpan span2 = tracer .buildSpan("test", "span2") - .asChildOf(span1.context()) + .asChildOf(span1.spanContext()) .withRequestContextData(RequestContextSlot.APPSEC, "override") .withRequestContextData(RequestContextSlot.CI_VISIBILITY, "override") .withRequestContextData(RequestContextSlot.IAST, "override") @@ -518,7 +520,7 @@ void canOverwriteRequestContextDataWithBuilder() { .withRequestContextDataAppSec("value"); AgentSpan span1 = tracer.buildSpan("test", "span1").asChildOf(context).start(); - AgentSpan span2 = tracer.buildSpan("test", "span2").asChildOf(span1.context()).start(); + AgentSpan span2 = tracer.buildSpan("test", "span2").asChildOf(span1.spanContext()).start(); assertEquals("value", span2.getRequestContext().getData(RequestContextSlot.APPSEC)); assertEquals("value", span2.getRequestContext().getData(RequestContextSlot.CI_VISIBILITY)); @@ -527,7 +529,7 @@ void canOverwriteRequestContextDataWithBuilder() { AgentSpan span3 = tracer .buildSpan("test", "span3") - .asChildOf(span2.context()) + .asChildOf(span2.spanContext()) .withRequestContextData(RequestContextSlot.APPSEC, "override") .withRequestContextData(RequestContextSlot.CI_VISIBILITY, "override") .withRequestContextData(RequestContextSlot.IAST, "override") diff --git a/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest.java index 897b80dc625..794af6d4650 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/CoreTracerTest.java @@ -200,7 +200,7 @@ void rootTagsAppliedOnlyToRootSpans() { localRootSpanTags.put("only_root", "value"); CoreTracer tracer = tracerBuilder().localRootSpanTags(localRootSpanTags).build(); AgentSpan root = tracer.buildSpan("datadog", "my_root").start(); - AgentSpan child = tracer.buildSpan("datadog", "my_child").asChildOf(root.context()).start(); + AgentSpan child = tracer.buildSpan("datadog", "my_child").asChildOf(root.spanContext()).start(); try { assertTrue(root.getTags().containsKey("only_root")); assertFalse(child.getTags().containsKey("only_root")); @@ -232,7 +232,7 @@ void prioritySamplingSetWhenChildSpanComplete() throws Exception { try { DDSpan root = (DDSpan) tracer.buildSpan("datadog", "operation").start(); DDSpan child = - (DDSpan) tracer.buildSpan("datadog", "my_child").asChildOf(root.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "my_child").asChildOf(root.spanContext()).start(); root.finish(); assertNull(root.getSamplingPriority()); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextPropagationTagsTest.java b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextPropagationTagsTest.java index e56b8a92cbe..c027685ee2b 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextPropagationTagsTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextPropagationTagsTest.java @@ -58,7 +58,7 @@ void updateSpanPropagationTags( new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG) .withRequestContextDataAppSec("dummy"); DDSpan span = (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start(); - PropagationTags dd = span.context().getPropagationTags(); + PropagationTags dd = span.spanContext().getPropagationTags(); span.setSamplingPriority(newPriority, newMechanism); @@ -90,9 +90,9 @@ void updateTracePropagationTags( new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG) .withRequestContextDataAppSec("dummy"); DDSpan rootSpan = (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start(); - PropagationTags ddRoot = rootSpan.context().getPropagationTags(); + PropagationTags ddRoot = rootSpan.spanContext().getPropagationTags(); DDSpan span = - (DDSpan) tracer.buildSpan("datadog", "current").asChildOf(rootSpan.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "current").asChildOf(rootSpan.spanContext()).start(); span.setSamplingPriority(newPriority, newMechanism); @@ -116,9 +116,9 @@ void forceKeepSpanPropagationTags( new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG) .withRequestContextDataAppSec("dummy"); DDSpan span = (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start(); - PropagationTags dd = span.context().getPropagationTags(); + PropagationTags dd = span.spanContext().getPropagationTags(); - span.context().forceKeep(); + span.spanContext().forceKeep(); assertEquals(newHeader, dd.headerValue(PropagationTags.HeaderType.DATADOG)); assertEquals(tagMap, dd.createTagMap()); @@ -144,11 +144,11 @@ void forceKeepTracePropagationTags( new ExtractedContext(DDTraceId.from(123), 456, priority, "789", propagationTags, DATADOG) .withRequestContextDataAppSec("dummy"); DDSpan rootSpan = (DDSpan) tracer.buildSpan("datadog", "top").asChildOf(extracted).start(); - PropagationTags ddRoot = rootSpan.context().getPropagationTags(); + PropagationTags ddRoot = rootSpan.spanContext().getPropagationTags(); DDSpan span = - (DDSpan) tracer.buildSpan("datadog", "current").asChildOf(rootSpan.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "current").asChildOf(rootSpan.spanContext()).start(); - span.context().forceKeep(); + span.spanContext().forceKeep(); assertEquals(rootHeader, ddRoot.headerValue(PropagationTags.HeaderType.DATADOG)); assertEquals(rootTagMap, ddRoot.createTagMap()); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextTest.java b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextTest.java index 4185c9acdab..0c59c0c4f7b 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanContextTest.java @@ -80,7 +80,7 @@ void nullValuesForTagsDeleteExistingTags(String name) throws Exception { .withResourceName("fakeResource") .withSpanType("fakeType") .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); context.setTag("some.tag", "asdf"); context.setTag(name, null); @@ -125,7 +125,7 @@ void specialTagsSetCertainValues(String scenario, String name, String expected, .withResourceName("fakeResource") .withSpanType("fakeType") .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); context.setTag(name, expected); span.finish(); @@ -170,7 +170,7 @@ void tagsCanBeAddedToContext(String name, Object value) throws Exception { .withResourceName("fakeResource") .withSpanType("fakeType") .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); context.setTag(name, value); span.finish(); @@ -206,7 +206,7 @@ void metricsUseExpectedTypes(Class expectedType, Number value) { .withServiceName("fakeService") .withResourceName("fakeResource") .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); context.setMetric("test", value); @@ -223,7 +223,7 @@ void forceKeepReallyKeepsTrace() { .withServiceName("fakeService") .withResourceName("fakeResource") .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); context.setSamplingPriority(SAMPLER_DROP, DEFAULT); assertEquals(SAMPLER_DROP, context.getSamplingPriority()); @@ -253,12 +253,12 @@ void setTraceSegmentTagsAndDataOnCorrectSpan() { AgentSpan top = tracer.buildSpan("datadog", "top").asChildOf((AgentSpanContext) extracted).start(); - DDSpanContext topC = (DDSpanContext) top.context(); + DDSpanContext topC = (DDSpanContext) top.spanContext(); TraceSegment topTS = top.getRequestContext().getTraceSegment(); - AgentSpan current = tracer.buildSpan("datadog", "current").asChildOf(top.context()).start(); + AgentSpan current = tracer.buildSpan("datadog", "current").asChildOf(top.spanContext()).start(); TraceSegment currentTS = current.getRequestContext().getTraceSegment(); - DDSpanContext currentC = (DDSpanContext) current.context(); + DDSpanContext currentC = (DDSpanContext) current.spanContext(); currentTS.setDataTop("ctd", "[1]"); currentTS.setTagTop("ctt", "t1"); @@ -300,7 +300,7 @@ void setSingleSpanSamplingTags(double rate, int limit) { .withServiceName("fakeService") .withResourceName("fakeResource") .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); assertEquals(UNSET, context.getSamplingPriority()); context.setSpanSamplingPriority(rate, limit); @@ -348,20 +348,20 @@ void settingOperationNameTriggersConstantEncoding() { verify(profilingContextIntegration, times(1)).encodeOperationName("fakeOperation"); verify(profilingContextIntegration, times(1)).encodeResourceName("fakeResource"); - assertEquals(1, ((DDSpanContext) span.context()).getEncodedOperationName()); - assertEquals(-1, ((DDSpanContext) span.context()).getEncodedResourceName()); + assertEquals(1, ((DDSpanContext) span.spanContext()).getEncodedOperationName()); + assertEquals(-1, ((DDSpanContext) span.spanContext()).getEncodedResourceName()); when(profilingContextIntegration.encodeOperationName("newOperationName")).thenReturn(2); span.setOperationName("newOperationName"); verify(profilingContextIntegration, times(1)).encodeOperationName("newOperationName"); - assertEquals(2, ((DDSpanContext) span.context()).getEncodedOperationName()); + assertEquals(2, ((DDSpanContext) span.spanContext()).getEncodedOperationName()); when(profilingContextIntegration.encodeResourceName("newResourceName")).thenReturn(-2); span.setResourceName("newResourceName"); verify(profilingContextIntegration, times(1)).encodeResourceName("newResourceName"); - assertEquals(-2, ((DDSpanContext) span.context()).getEncodedResourceName()); + assertEquals(-2, ((DDSpanContext) span.spanContext()).getEncodedResourceName()); span.finish(); } @@ -382,10 +382,10 @@ void spanIdsPrintedAsUnsignedLong() { .withServiceName("fakeService") .withResourceName("fakeResource") .withSpanId(-123456789) - .asChildOf(parent.context()) + .asChildOf(parent.spanContext()) .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); // even though span ID and parent ID are setup as negative numbers, they should be printed as // their unsigned value @@ -402,8 +402,8 @@ void serviceNameSourceIsPropagatedFromParentToChildSpan() { tracer.buildSpan("datadog", "parentOperation").withServiceName("fakeService").start(); AgentSpan child = - tracer.buildSpan("datadog", "childOperation").asChildOf(parent.context()).start(); - DDSpanContext childContext = (DDSpanContext) child.context(); + tracer.buildSpan("datadog", "childOperation").asChildOf(parent.spanContext()).start(); + DDSpanContext childContext = (DDSpanContext) child.spanContext(); assertEquals(ServiceNameSources.MANUAL, childContext.getServiceNameSource()); @@ -441,7 +441,7 @@ void spanKindOrdinalConstantsAndSpanKindValuesArrayStayInSync() { void setSpanKindOrdinalRoundTripsWithSpanKindValues( String scenario, String kindString, int expectedOrdinal) { AgentSpan span = tracer.buildSpan("test", "test").start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); context.setSpanKindOrdinal(kindString); assertEquals(expectedOrdinal, context.getSpanKindOrdinal()); @@ -462,7 +462,7 @@ void builderLedgerRemovalOfSpanKindClearsCachedOrdinal() { .withTag(SPAN_KIND, Tags.SPAN_KIND_CLIENT) .withTag(SPAN_KIND, (Object) null) .start(); - DDSpanContext context = (DDSpanContext) span.context(); + DDSpanContext context = (DDSpanContext) span.spanContext(); assertNull(context.getTag(SPAN_KIND)); assertEquals(DDSpanContext.SPAN_KIND_UNSET, context.getSpanKindOrdinal()); @@ -537,7 +537,7 @@ void setTagThenRemoveTagClearsSpanKind(String kindString) { assertEquals(kindString, span.getTag(SPAN_KIND)); - ((DDSpan) span).context().removeTag(SPAN_KIND); + ((DDSpan) span).spanContext().removeTag(SPAN_KIND); assertNull(span.getTag(SPAN_KIND)); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java index 78c8dda3c94..cc27763caa3 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanSerializationTest.java @@ -59,7 +59,7 @@ void serializeTraceWithIdAsInt(String scenario, String value, String spanType) t CoreTracer tracer = tracerBuilder().writer(writer).build(); DDTraceId traceId = DDTraceId.from(value); long spanId = DDSpanId.from(value); - DDSpanContext context = createContext(spanType, tracer, traceId, spanId); + DDSpanContext context = createSpanContext(spanType, tracer, traceId, spanId); DDSpan span = DDSpan.create("test", 0, context, null); CaptureBuffer capture = new CaptureBuffer(); MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture)); @@ -116,7 +116,7 @@ void serializeTraceWithIdAsIntV05(String scenario, String value, String spanType CoreTracer tracer = tracerBuilder().writer(writer).build(); DDTraceId traceId = DDTraceId.from(value); long spanId = DDSpanId.from(value); - DDSpanContext context = createContext(spanType, tracer, traceId, spanId); + DDSpanContext context = createSpanContext(spanType, tracer, traceId, spanId); DDSpan span = DDSpan.create("test", 0, context, null); CaptureBuffer capture = new CaptureBuffer(); MsgPackWriter packer = new MsgPackWriter(new FlushingBuffer(1024, capture)); @@ -455,7 +455,7 @@ public void accept(int messageCount, ByteBuffer buffer) { } } - private DDSpanContext createContext( + private DDSpanContext createSpanContext( String spanType, CoreTracer tracer, DDTraceId traceId, long spanId) { Map baggage = new HashMap<>(); baggage.put("a-baggage", "value"); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanTest.java b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanTest.java index 611c8806767..a05e9d982c4 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/DDSpanTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/DDSpanTest.java @@ -90,7 +90,7 @@ void gettersAndSetters() { span.setSamplingPriority(PrioritySampling.SAMPLER_KEEP); assertEquals(PrioritySampling.SAMPLER_KEEP, (int) span.getSamplingPriority()); - span.context().lockSamplingPriority(); + span.spanContext().lockSamplingPriority(); span.setSamplingPriority(PrioritySampling.USER_KEEP); assertEquals(PrioritySampling.SAMPLER_KEEP, (int) span.getSamplingPriority()); } @@ -253,18 +253,18 @@ void stoppingWithTimestampBeforeStartTimeYieldsMinDurationOfOne() { void prioritySamplingMetricSetOnlyOnRootSpan() { DDSpan parent = (DDSpan) tracer.buildSpan("datadog", "testParent").start(); DDSpan child1 = - (DDSpan) tracer.buildSpan("datadog", "testChild1").asChildOf(parent.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "testChild1").asChildOf(parent.spanContext()).start(); child1.setSamplingPriority(PrioritySampling.SAMPLER_KEEP); - child1.context().lockSamplingPriority(); + child1.spanContext().lockSamplingPriority(); parent.setSamplingPriority(PrioritySampling.SAMPLER_DROP); child1.finish(); DDSpan child2 = - (DDSpan) tracer.buildSpan("datadog", "testChild2").asChildOf(parent.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "testChild2").asChildOf(parent.spanContext()).start(); child2.finish(); parent.finish(); - assertEquals(PrioritySampling.SAMPLER_KEEP, parent.context().getSamplingPriority()); + assertEquals(PrioritySampling.SAMPLER_KEEP, parent.spanContext().getSamplingPriority()); assertEquals(PrioritySampling.SAMPLER_KEEP, (int) parent.getSamplingPriority()); assertTrue(parent.hasSamplingPriority()); assertEquals(parent.getSamplingPriority(), child1.getSamplingPriority()); @@ -293,10 +293,14 @@ void originSetOnlyOnRootSpan(String scenario, AgentSpanContext extractedContext) throws Exception { DDSpanContext parent = (DDSpanContext) - tracer.buildSpan("datadog", "testParent").asChildOf(extractedContext).start().context(); + tracer + .buildSpan("datadog", "testParent") + .asChildOf(extractedContext) + .start() + .spanContext(); DDSpanContext child = (DDSpanContext) - tracer.buildSpan("datadog", "testChild1").asChildOf(parent).start().context(); + tracer.buildSpan("datadog", "testChild1").asChildOf(parent).start().spanContext(); assertEquals("some-origin", parent.getOrigin().toString()); // Access field directly instead of getter. @@ -328,7 +332,8 @@ static Stream isRootSpanArguments() { void isRootSpanInAndNotInContextOfDistributedTracing( String scenario, AgentSpanContext extractedContext, boolean isTraceRootSpan) { DDSpan root = (DDSpan) tracer.buildSpan("datadog", "root").asChildOf(extractedContext).start(); - DDSpan child = (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.context()).start(); + DDSpan child = + (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.spanContext()).start(); assertEquals(isTraceRootSpan, root.isRootSpan()); assertFalse(child.isRootSpan()); @@ -356,7 +361,8 @@ static Stream getApplicationRootSpanArguments() { void getApplicationRootSpanInAndNotInContextOfDistributedTracing( String scenario, AgentSpanContext extractedContext) { DDSpan root = (DDSpan) tracer.buildSpan("datadog", "root").asChildOf(extractedContext).start(); - DDSpan child = (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.context()).start(); + DDSpan child = + (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.spanContext()).start(); assertEquals(root, root.getLocalRootSpan()); assertEquals(root, child.getLocalRootSpan()); @@ -373,7 +379,8 @@ void publishingOfRootSpanClosesRequestContextData() throws Exception { Closeable reqContextData = mock(Closeable.class); TagContext context = new TagContext().withRequestContextDataAppSec(reqContextData); DDSpan root = (DDSpan) tracer.buildSpan("datadog", "root").asChildOf(context).start(); - DDSpan child = (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.context()).start(); + DDSpan child = + (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(root.spanContext()).start(); assertEquals(reqContextData, root.getRequestContext().getData(RequestContextSlot.APPSEC)); assertEquals(reqContextData, child.getRequestContext().getData(RequestContextSlot.APPSEC)); @@ -525,12 +532,12 @@ void errorPrioritiesShouldBeRespected() { } private static int pendingReferenceCount(DDSpan span) { - PendingTrace trace = (PendingTrace) span.context().getTraceCollector(); + PendingTrace trace = (PendingTrace) span.spanContext().getTraceCollector(); return PendingTraceTestBridge.getPendingReferenceCount(trace); } private static Collection spans(DDSpan span) { - PendingTrace trace = (PendingTrace) span.context().getTraceCollector(); + PendingTrace trace = (PendingTrace) span.spanContext().getTraceCollector(); return trace.getSpans(); } } diff --git a/dd-trace-core/src/test/java/datadog/trace/core/KnuthSamplingRateTest.java b/dd-trace-core/src/test/java/datadog/trace/core/KnuthSamplingRateTest.java index 8ec4aefc178..324b50ecfe2 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/KnuthSamplingRateTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/KnuthSamplingRateTest.java @@ -83,7 +83,7 @@ void agentRateSamplerSetsKsrPropagatedTag(String scenario, double rate, String e .start(); serviceSampler.setSamplingPriority(span); - Map propagationMap = span.context().getPropagationTags().createTagMap(); + Map propagationMap = span.spanContext().getPropagationTags().createTagMap(); String ksr = propagationMap.get("_dd.p.ksr"); assertEquals(expectedKsr, ksr); @@ -114,7 +114,7 @@ void ruleBasedSamplerSetsKsrPropagatedTagWhenRuleMatches( .start(); ((PrioritySampler) sampler).setSamplingPriority(span); - Map propagationMap = span.context().getPropagationTags().createTagMap(); + Map propagationMap = span.spanContext().getPropagationTags().createTagMap(); String ksr = propagationMap.get("_dd.p.ksr"); assertEquals(expectedKsr, ksr); @@ -141,7 +141,7 @@ void ruleBasedSamplerFallbackToAgentSamplerSetsKsr() { .start(); ((PrioritySampler) sampler).setSamplingPriority(span); - Map propagationMap = span.context().getPropagationTags().createTagMap(); + Map propagationMap = span.spanContext().getPropagationTags().createTagMap(); String ksr = propagationMap.get("_dd.p.ksr"); // When falling back to agent sampler, ksr should still be set (agent rate = 1.0 by default) assertEquals("1", ksr); @@ -167,7 +167,7 @@ void serviceRuleSamplerSetsKsrPropagatedTag() { .start(); ((PrioritySampler) sampler).setSamplingPriority(span); - Map propagationMap = span.context().getPropagationTags().createTagMap(); + Map propagationMap = span.spanContext().getPropagationTags().createTagMap(); String ksr = propagationMap.get("_dd.p.ksr"); assertEquals("0.75", ksr); @@ -192,7 +192,7 @@ void defaultRateSamplerSetsKsrPropagatedTag() { .start(); ((PrioritySampler) sampler).setSamplingPriority(span); - Map propagationMap = span.context().getPropagationTags().createTagMap(); + Map propagationMap = span.spanContext().getPropagationTags().createTagMap(); String ksr = propagationMap.get("_dd.p.ksr"); assertEquals("0.25", ksr); @@ -221,7 +221,7 @@ void ksrIsPropagatedViaXDatadogTagsHeader() { serviceSampler.setSamplingPriority(span); String headerValue = - span.context().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG); + span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG); assertNotNull(headerValue); assertTrue(headerValue.contains("_dd.p.ksr=0.5")); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceBufferTest.java b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceBufferTest.java index f64eb105be8..0c29b392623 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceBufferTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceBufferTest.java @@ -539,12 +539,12 @@ private static DDSpan newSpanOf(PendingTrace trace, int samplingPriority, long t } private static DDSpan newSpanOf(DDSpan parent) { - TraceCollector traceCollector = parent.context().getTraceCollector(); + TraceCollector traceCollector = parent.spanContext().getTraceCollector(); DDSpanContext context = new DDSpanContext( - parent.context().getTraceId(), + parent.spanContext().getTraceId(), 2, - parent.context().getSpanId(), + parent.spanContext().getSpanId(), null, "fakeService", "fakeOperation", diff --git a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBase.java b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBase.java index c6b5f5a54af..cafdcd50bb3 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBase.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTestBase.java @@ -33,7 +33,7 @@ void setup() throws Exception { writer = new ListWriter(); tracer = tracerBuilder().writer(writer).build(); rootSpan = (DDSpan) tracer.buildSpan("datadog", "fakeOperation").start(); - traceCollector = (PendingTrace) rootSpan.context().getTraceCollector(); + traceCollector = (PendingTrace) rootSpan.spanContext().getTraceCollector(); assertEquals(0, traceCollector.size()); assertEquals(1, traceCollector.getPendingReferenceCount()); @@ -60,7 +60,7 @@ void singleSpanWrittenWhenFinished() throws InterruptedException, TimeoutExcepti @Test void childFinishesBeforeParent() throws InterruptedException, TimeoutException { DDSpan child = - (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.spanContext()).start(); assertEquals(2, traceCollector.getPendingReferenceCount()); @@ -82,7 +82,7 @@ void childFinishesBeforeParent() throws InterruptedException, TimeoutException { @Test void parentFinishesBeforeChild() throws InterruptedException, TimeoutException { DDSpan child = - (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.spanContext()).start(); assertEquals(2, traceCollector.getPendingReferenceCount()); @@ -109,7 +109,7 @@ void childSpansCreatedAfterWrittenReportedSeparately() // may incorrectly add spans after the trace is reported. // in those cases we should still decrement the pending trace count DDSpan childSpan = - (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.context()).start(); + (DDSpan) tracer.buildSpan("datadog", "child").asChildOf(rootSpan.spanContext()).start(); childSpan.finish(); writer.waitForTraces(2); @@ -135,13 +135,13 @@ void partialFlush() throws InterruptedException, TimeoutException { CoreTracer quickTracer = tracerBuilder().writer(writer).build(); try { DDSpan localRoot = (DDSpan) quickTracer.buildSpan("datadog", "root").start(); - PendingTrace trace = (PendingTrace) localRoot.context().getTraceCollector(); + PendingTrace trace = (PendingTrace) localRoot.spanContext().getTraceCollector(); DDSpan child1 = (DDSpan) - quickTracer.buildSpan("datadog", "child1").asChildOf(localRoot.context()).start(); + quickTracer.buildSpan("datadog", "child1").asChildOf(localRoot.spanContext()).start(); DDSpan child2 = (DDSpan) - quickTracer.buildSpan("datadog", "child2").asChildOf(localRoot.context()).start(); + quickTracer.buildSpan("datadog", "child2").asChildOf(localRoot.spanContext()).start(); assertEquals(3, trace.getPendingReferenceCount()); @@ -180,13 +180,13 @@ void partialFlushWithRootSpanClosedLast() throws InterruptedException, TimeoutEx CoreTracer quickTracer = tracerBuilder().writer(writer).build(); try { DDSpan localRoot = (DDSpan) quickTracer.buildSpan("datadog", "root").start(); - PendingTrace trace = (PendingTrace) localRoot.context().getTraceCollector(); + PendingTrace trace = (PendingTrace) localRoot.spanContext().getTraceCollector(); DDSpan child1 = (DDSpan) - quickTracer.buildSpan("datadog", "child1").asChildOf(localRoot.context()).start(); + quickTracer.buildSpan("datadog", "child1").asChildOf(localRoot.spanContext()).start(); DDSpan child2 = (DDSpan) - quickTracer.buildSpan("datadog", "child2").asChildOf(localRoot.context()).start(); + quickTracer.buildSpan("datadog", "child2").asChildOf(localRoot.spanContext()).start(); assertEquals(3, trace.getPendingReferenceCount()); @@ -240,7 +240,7 @@ void partialFlushConcurrencyTest(int threadCount, int spanCount) try { CountDownLatch latch = new CountDownLatch(1); DDSpan localRoot = (DDSpan) tracer.buildSpan("test", "root").start(); - PendingTrace localTraceCollector = (PendingTrace) localRoot.context().getTraceCollector(); + PendingTrace localTraceCollector = (PendingTrace) localRoot.spanContext().getTraceCollector(); List exceptions = new ArrayList<>(); List threads = new ArrayList<>(threadCount); @@ -252,7 +252,8 @@ void partialFlushConcurrencyTest(int threadCount, int spanCount) latch.await(); List spans = new ArrayList<>(spanCount); for (int s = 0; s < spanCount; s++) { - spans.add((DDSpan) tracer.startSpan("test", "child", localRoot.context())); + spans.add( + (DDSpan) tracer.startSpan("test", "child", localRoot.spanContext())); } for (DDSpan span : spans) { span.finish(); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorTest.java index 0d6f6788ca6..c81b31b036b 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/TraceInterceptorTest.java @@ -188,13 +188,13 @@ public int priority() { assertEquals(1, trace.size()); DDSpan span = trace.get(0); - assertEquals("modifiedON-test", span.context().getOperationName().toString()); + assertEquals("modifiedON-test", span.spanContext().getOperationName().toString()); assertTrue(span.getServiceName().startsWith("modifiedSN-")); assertEquals("modifiedRN-modifiedON-test", span.getResourceName().toString()); assertEquals("modifiedST-null", span.getSpanType()); - assertTrue(span.context().getErrorFlag()); + assertTrue(span.spanContext().getErrorFlag()); - TagMap tags = span.context().getTags(); + TagMap tags = span.spanContext().getTags(); assertEquals(true, tags.get("boolean-tag")); assertEquals(5.0, tags.get("number-tag")); assertEquals("howdy", tags.get("string-tag")); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/CheckpointerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/CheckpointerTest.java index 26e4a157aba..e4a084c872c 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/CheckpointerTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/CheckpointerTest.java @@ -45,7 +45,7 @@ void testSettingProduceAndConsumeCheckpoint() { carrier.entries().stream() .anyMatch(entry -> "dd-pathway-ctx-base64".equals(entry.getKey())); assertTrue(hasPathwayCtxBase64); - assertNotEquals(0L, ((DDSpan) span).context().getPathwayContext().getHash()); + assertNotEquals(0L, ((DDSpan) span).spanContext().getPathwayContext().getHash()); } static class CustomContextCarrier implements DataStreamsContextCarrier { diff --git a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultPathwayContextTest.java b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultPathwayContextTest.java index 013a73e2686..8860cf1571c 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultPathwayContextTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/datastreams/DefaultPathwayContextTest.java @@ -534,9 +534,9 @@ void checkContextExtractorDecoratorBehavior(boolean dynamicConfigEnabled) throws assertEquals("L+lDG/Pa9hRkZA==", encoded); if (dynamicConfigEnabled) { assertNotNull(extractedSpan); - assertNotNull(extractedSpan.context()); - assertNotNull(extractedSpan.context().getPathwayContext()); - assertTrue(extractedSpan.context().getPathwayContext().isStarted()); + assertNotNull(extractedSpan.spanContext()); + assertNotNull(extractedSpan.spanContext().getPathwayContext()); + assertTrue(extractedSpan.spanContext().getPathwayContext().isStarted()); } } finally { // cleanup @@ -595,9 +595,9 @@ void checkContextExtractorDecoratorBehaviorWhenTraceDataIsNull(boolean globalDsm assertEquals("L+lDG/Pa9hRkZA==", encoded); if (globalDsmEnabled) { assertNotNull(extractedSpan); - assertNotNull(extractedSpan.context()); - assertNotNull(extractedSpan.context().getPathwayContext()); - assertTrue(extractedSpan.context().getPathwayContext().isStarted()); + assertNotNull(extractedSpan.spanContext()); + assertNotNull(extractedSpan.spanContext().getPathwayContext()); + assertTrue(extractedSpan.spanContext().getPathwayContext().isStarted()); } else { assertNull(extractedSpan); } @@ -667,15 +667,15 @@ void checkContextExtractorDecoratorBehaviorWhenLocalTraceConfigIsNull(boolean gl assertNotNull(extractedSpan); - Object extracted = extractedSpan.context(); + Object extracted = extractedSpan.spanContext(); assertNotNull(extracted); assertEquals("L+lDG/Pa9hRkZA==", encoded); if (globalDsmEnabled) { - assertNotNull(extractedSpan.context().getPathwayContext()); - assertTrue(extractedSpan.context().getPathwayContext().isStarted()); + assertNotNull(extractedSpan.spanContext().getPathwayContext()); + assertTrue(extractedSpan.spanContext().getPathwayContext().isStarted()); } else { - assertNull(extractedSpan.context().getPathwayContext()); + assertNull(extractedSpan.spanContext().getPathwayContext()); } } finally { // cleanup diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsProtoTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsProtoTest.java index a9ddef32e35..a17165ef95c 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsProtoTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/logs/OtlpLogsProtoTest.java @@ -473,7 +473,7 @@ private static AgentSpanContext resolveContext(List spans, LogSpec spec) return null; } DDSpan span = spans.get(spec.spanContextIndex); - return span.context(); + return span.spanContext(); } // ── grouping helper ─────────────────────────────────────────────────────── diff --git a/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceProtoTest.java b/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceProtoTest.java index 6c8c219cbc6..1e3b8df4b24 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceProtoTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/otlp/trace/OtlpTraceProtoTest.java @@ -714,7 +714,7 @@ private static List buildSpans(List specs) { TRACER.startSpan( "test", spec.operationName, - spans.get(spec.parentIndex).context(), + spans.get(spec.parentIndex).spanContext(), spec.startMicros); } else { agentSpan = TRACER.startSpan("test", spec.operationName, spec.startMicros); @@ -756,7 +756,7 @@ private static List buildSpans(List specs) { for (LinkSpec link : spec.links) { agentSpan.addLink( SpanLink.from( - spans.get(link.targetIndex).context(), + spans.get(link.targetIndex).spanContext(), link.traceFlags, link.traceState, link.attributes)); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpExtractorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpExtractorTest.java index eb9727cc4a7..a950013ab7a 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpExtractorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/HttpExtractorTest.java @@ -200,7 +200,7 @@ void verifyExistenceOfSpanLinks( TagContext context = extractor.extract(headers, stringValuesMap()); - List links = context.getTerminatedContextLinks(); + List links = context.getTerminatedSpanLinks(); assertEquals(expectedSpanLinks.size(), links.size()); for (int i = 0; i < links.size(); i++) { TracePropagationStyle style = expectedSpanLinks.get(i); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/OrgGuardEndToEndTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/OrgGuardEndToEndTest.java index 447310d897e..3557ad10e68 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/OrgGuardEndToEndTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/OrgGuardEndToEndTest.java @@ -94,7 +94,7 @@ void extractStripsOnMismatch() { Context extracted = propagator.extract(Context.root(), headers, stringValuesMap()); AgentSpan span = AgentSpan.fromContext(extracted); assertNotNull(span, "extracted span missing"); - ExtractedContext ec = (ExtractedContext) span.context(); + ExtractedContext ec = (ExtractedContext) span.spanContext(); assertEquals(DDTraceId.from(123L), ec.getTraceId()); assertEquals(456L, ec.getSpanId()); assertEquals(UNSET, ec.getSamplingPriority()); @@ -116,7 +116,7 @@ void extractTrustedOpm() { headers.put(DatadogHttpCodec.DATADOG_TAGS_KEY, "_dd.p.opm=TRUSTED1,_dd.p.dm=-4"); Context extracted = propagator.extract(Context.root(), headers, stringValuesMap()); - ExtractedContext ec = (ExtractedContext) AgentSpan.fromContext(extracted).context(); + ExtractedContext ec = (ExtractedContext) AgentSpan.fromContext(extracted).spanContext(); assertEquals(2, ec.getSamplingPriority()); assertEquals("TRUSTED1", ec.getPropagationTags().getOrgPropagationMarker().toString()); } @@ -133,7 +133,7 @@ void roundTripPreservesForeignVendors() { headers.put("tracestate", "dd=s:2;o:foo;t.opm:upstream-X;t.dm:-4,vendor1=abc,vendor2=def"); Context extracted = propagator.extract(Context.root(), headers, stringValuesMap()); - ExtractedContext ec = (ExtractedContext) AgentSpan.fromContext(extracted).context(); + ExtractedContext ec = (ExtractedContext) AgentSpan.fromContext(extracted).spanContext(); assertEquals(UNSET, ec.getSamplingPriority(), "should be stripped"); String reEncoded = ec.getPropagationTags().headerValue(W3C); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/TracingPropagatorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/TracingPropagatorTest.java index 6805c853912..78024ccaac3 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/TracingPropagatorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/TracingPropagatorTest.java @@ -56,7 +56,7 @@ void testTracingPropagatorContextInjection() { this.propagator.inject(span, carrier, Map::put); - verify(this.injector).inject(same((DDSpanContext) span.context()), same(carrier), any()); + verify(this.injector).inject(same((DDSpanContext) span.spanContext()), same(carrier), any()); span.finish(); tracer.close(); @@ -162,7 +162,7 @@ void testPropagationWhenTracingIsDisabled( int injected = (tracingEnabled || product != UNSET) ? 1 : 0; verify(this.injector, times(injected)) - .inject(same((DDSpanContext) span.context()), same(carrier), any()); + .inject(same((DDSpanContext) span.spanContext()), same(carrier), any()); span.finish(); tracer.close(); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java index fc0256b5eb2..032d2438b6d 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/propagation/W3CHttpInjectorTest.java @@ -132,7 +132,7 @@ void updateLastParentIdOnChildSpan() { long rootSpanId = rootSpan.getSpanId(); AgentScope rootScope = this.tracer.activateSpan(rootSpan); - this.injector.inject((DDSpanContext) rootSpan.context(), carrier, Map::put); + this.injector.inject((DDSpanContext) rootSpan.spanContext(), carrier, Map::put); // trace state has root span id as last parent assertEquals(rootSpanId, extractLastParentId(carrier)); @@ -141,7 +141,7 @@ void updateLastParentIdOnChildSpan() { AgentSpan childSpan = this.tracer.startSpan("test", "child"); long childSpanId = childSpan.getSpanId(); carrier.clear(); - this.injector.inject((DDSpanContext) childSpan.context(), carrier, Map::put); + this.injector.inject((DDSpanContext) childSpan.spanContext(), carrier, Map::put); // trace state has child span id as last parent assertEquals(childSpanId, extractLastParentId(carrier)); @@ -149,7 +149,7 @@ void updateLastParentIdOnChildSpan() { // injecting root span again childSpan.finish(); carrier.clear(); - this.injector.inject((DDSpanContext) rootSpan.context(), carrier, Map::put); + this.injector.inject((DDSpanContext) rootSpan.spanContext(), carrier, Map::put); // trace state has root span is as last parent again assertEquals(rootSpanId, extractLastParentId(carrier)); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerTest.java b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerTest.java index 11ca5fb7c01..122ddd560c7 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerTest.java @@ -158,11 +158,11 @@ void setsParentAsCurrentUponClose() { assertSame(childScope, scopeManager.active()); assertEquals( - parentScope.span().context().getSpanId(), - ((DDSpan) childScope.span()).context().getParentId()); + parentScope.span().spanContext().getSpanId(), + ((DDSpan) childScope.span()).spanContext().getParentId()); assertSame( - parentScope.span().context().getTraceCollector(), - childScope.span().context().getTraceCollector()); + parentScope.span().spanContext().getTraceCollector(), + childScope.span().spanContext().getTraceCollector()); childScope.close(); @@ -353,7 +353,7 @@ void continuationAllowsAddingSpansEvenAfterOtherSpansWereCompleted() throws Exce // the child has the correct parent assertNull(scopeManager.active()); assertTrue(spanFinished(childSpan)); - assertEquals(span.context().getSpanId(), ((DDSpan) childSpan).context().getParentId()); + assertEquals(span.spanContext().getSpanId(), ((DDSpan) childSpan).spanContext().getParentId()); assertEquals(1, writer.size()); assertTrue(writer.get(0).containsAll(Arrays.asList(childSpan, span))); } diff --git a/dd-trace-core/src/test/java/datadog/trace/core/taginterceptor/TagInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/taginterceptor/TagInterceptorTest.java index 296c6d11997..6f1e714334e 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/taginterceptor/TagInterceptorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/taginterceptor/TagInterceptorTest.java @@ -476,7 +476,7 @@ void samplingPriorityPositiveTagOverridesDecisionMakerFromUpstreamPropagation() assertEquals((int) PrioritySampling.USER_KEEP, span.getSamplingPriority()); assertEquals( "_dd.p.dm=-4", - span.context().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG)); + span.spanContext().getPropagationTags().headerValue(PropagationTags.HeaderType.DATADOG)); } @ParameterizedTest @@ -523,7 +523,7 @@ void interceptorsApplyToBuilderToo( span.finish(); writer.waitForTraces(1); - assertEquals(value, getter.apply((DDSpanContext) span.context())); + assertEquals(value, getter.apply((DDSpanContext) span.spanContext())); } @Test diff --git a/dd-trace-core/src/test/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.java b/dd-trace-core/src/test/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.java index 2397ca2fe6b..dfbc82954fc 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.java @@ -50,6 +50,6 @@ void testSetSamplingPriorityAccordingToLatency( List trace = writer.firstTrace(); assertEquals(1, trace.size()); DDSpan span = trace.get(0); - assertEquals(expected, span.context().getSamplingPriority()); + assertEquals(expected, span.spanContext().getSamplingPriority()); } } diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java index 853cb72c077..9494c772aee 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/DDTracer.java @@ -485,8 +485,8 @@ public DDSpanBuilder buildSpan(final String operationName) { @Override public void inject(final SpanContext spanContext, final Format format, final C carrier) { if (carrier instanceof TextMap) { - final AgentSpanContext context = converter.toContext(spanContext); - AgentSpan span = fromSpanContext(context); + final AgentSpanContext convertedSpanContext = converter.toContext(spanContext); + AgentSpan span = fromSpanContext(convertedSpanContext); defaultPropagator().inject(span, (TextMap) carrier, TextMapSetter.INSTANCE); } else { log.debug("Unsupported format for propagation - {}", format.getClass().getName()); @@ -534,9 +534,9 @@ public Profiling getProfilingContext() { @Override public TraceSegment getTraceSegment() { - AgentSpanContext ctx = tracer.activeSpan().context(); - if (ctx instanceof DDSpanContext) { - return ((DDSpanContext) ctx).getTraceSegment(); + AgentSpanContext spanContext = tracer.activeSpan().spanContext(); + if (spanContext instanceof DDSpanContext) { + return ((DDSpanContext) spanContext).getTraceSegment(); } return null; } @@ -593,29 +593,29 @@ public DDSpanBuilder asChildOf(final SpanContext parent) { @Override public DDSpanBuilder asChildOf(final Span parent) { if (parent != null) { - delegate.asChildOf(converter.toAgentSpan(parent).context()); + delegate.asChildOf(converter.toAgentSpan(parent).spanContext()); } return this; } @Override public DDSpanBuilder addReference( - final String referenceType, final SpanContext referencedContext) { - if (referencedContext == null) { + final String referenceType, final SpanContext referencedSpanContext) { + if (referencedSpanContext == null) { return this; } - final AgentSpanContext context = converter.toContext(referencedContext); - if (!(context instanceof ExtractedContext) && !(context instanceof DDSpanContext)) { + final AgentSpanContext spanContext = converter.toContext(referencedSpanContext); + if (!(spanContext instanceof ExtractedContext) && !(spanContext instanceof DDSpanContext)) { log.debug( "Expected to have a DDSpanContext or ExtractedContext but got {}", - context.getClass().getName()); + spanContext.getClass().getName()); return this; } if (References.CHILD_OF.equals(referenceType) || References.FOLLOWS_FROM.equals(referenceType)) { - delegate.asChildOf(context); + delegate.asChildOf(spanContext); } else { log.debug("Only support reference type of CHILD_OF and FOLLOWS_FROM"); } @@ -667,7 +667,7 @@ public Span startManual() { @Override public Span start() { final AgentSpan agentSpan = delegate.start(); - agentSpan.context().setIntegrationName("opentracing"); + agentSpan.spanContext().setIntegrationName("opentracing"); return converter.toSpan(agentSpan); } diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/OTSpan.java b/dd-trace-ot/src/main/java/datadog/opentracing/OTSpan.java index e13184374af..419cf3e4e68 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/OTSpan.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/OTSpan.java @@ -30,7 +30,7 @@ class OTSpan implements Span, MutableSpan, WithAgentSpan, SpanWrapper { @Override public SpanContext context() { - return converter.toSpanContext(delegate.context()); + return converter.toSpanContext(delegate.spanContext()); } @Override diff --git a/dd-trace-ot/src/ot31CompatibilityTest/java/datadog/opentracing/OT31ApiTest.java b/dd-trace-ot/src/ot31CompatibilityTest/java/datadog/opentracing/OT31ApiTest.java index 01693ddcdb2..be79fdd953c 100644 --- a/dd-trace-ot/src/ot31CompatibilityTest/java/datadog/opentracing/OT31ApiTest.java +++ b/dd-trace-ot/src/ot31CompatibilityTest/java/datadog/opentracing/OT31ApiTest.java @@ -109,8 +109,8 @@ void testInjectExtract( ddContext.setSamplingPriority(contextPriority, samplingMechanism); tracer.inject(context, Format.Builtin.TEXT_MAP, adapter); - DDTraceId traceId = ((OTSpan) span).getDelegate().context().getTraceId(); - long spanId = ((OTSpan) span).getDelegate().context().getSpanId(); + DDTraceId traceId = ((OTSpan) span).getDelegate().spanContext().getTraceId(); + long spanId = ((OTSpan) span).getDelegate().spanContext().getSpanId(); String expectedTraceparent = "00-" + traceId.toHexStringPadded(32) diff --git a/dd-trace-ot/src/ot33CompatibilityTest/java/datadog/opentracing/OT33ApiTest.java b/dd-trace-ot/src/ot33CompatibilityTest/java/datadog/opentracing/OT33ApiTest.java index cfbfa9a7568..a8f26327ec7 100644 --- a/dd-trace-ot/src/ot33CompatibilityTest/java/datadog/opentracing/OT33ApiTest.java +++ b/dd-trace-ot/src/ot33CompatibilityTest/java/datadog/opentracing/OT33ApiTest.java @@ -95,8 +95,8 @@ void testInjectExtract( ddContext.setSamplingPriority(contextPriority, samplingMechanism); tracer.inject(context, Format.Builtin.TEXT_MAP, adapter); - DDTraceId traceId = ((OTSpan) span).getDelegate().context().getTraceId(); - long spanId = ((OTSpan) span).getDelegate().context().getSpanId(); + DDTraceId traceId = ((OTSpan) span).getDelegate().spanContext().getTraceId(); + long spanId = ((OTSpan) span).getDelegate().spanContext().getSpanId(); String expectedTraceparent = "00-" + traceId.toHexStringPadded(32) diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java index 65f249278d1..ff8704e305e 100644 --- a/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java +++ b/dd-trace-ot/src/test/java/datadog/opentracing/DDTracerTest.java @@ -85,9 +85,10 @@ void shouldProduceBlackholeScopes() throws Exception { assertEquals(1, writer.size()); assertEquals(2, writer.firstTrace().size()); assertEquals( - Long.toString(writer.firstTrace().get(0).context().getSpanId()), span.context().toSpanId()); + Long.toString(writer.firstTrace().get(0).spanContext().getSpanId()), + span.context().toSpanId()); assertEquals( - Long.toString(writer.firstTrace().get(1).context().getSpanId()), + Long.toString(writer.firstTrace().get(1).spanContext().getSpanId()), visibleSpan.context().toSpanId()); tracer.close(); diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java b/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java index 090b134c490..8d6e8bcb372 100644 --- a/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java +++ b/dd-trace-ot/src/test/java/datadog/opentracing/OpenTracingAPITest.java @@ -304,7 +304,7 @@ void spanContextIdsEqualTracerIds() throws Exception { assertEquals(testSpan.context().toSpanId(), tracer.getSpanId()); assertEquals( testSpan.context().toTraceId(), - tracer.getInternalTracer().activeSpan().context().getTraceId().toString()); + tracer.getInternalTracer().activeSpan().spanContext().getTraceId().toString()); scope.close(); testSpan.finish(); @@ -442,7 +442,7 @@ void injectAndExtractContext() throws Exception { assertEquals("someService", serverSpanDD.getServiceName()); assertEquals("serverOperation", serverSpanDD.getOperationName().toString()); assertEquals("serverOperation", serverSpanDD.getResourceName().toString()); - assertEquals(clientSpan.context().getSpanId(), serverSpanDD.getParentId()); + assertEquals(clientSpan.spanContext().getSpanId(), serverSpanDD.getParentId()); } @Test diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java b/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java index 1e197733b53..aef0fb81a70 100644 --- a/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java +++ b/internal-api/src/main/java/datadog/trace/api/gateway/InferredProxySpan.java @@ -166,7 +166,7 @@ public AgentSpanContext start(AgentSpanContext extracted) { // Store inferred span this.span = span; // Return inferred span as new parent context - return this.span.context(); + return this.span.spanContext(); } private String header(String name) { diff --git a/internal-api/src/main/java/datadog/trace/api/propagation/W3CTraceParent.java b/internal-api/src/main/java/datadog/trace/api/propagation/W3CTraceParent.java index e999185a470..c8a15dc67e4 100644 --- a/internal-api/src/main/java/datadog/trace/api/propagation/W3CTraceParent.java +++ b/internal-api/src/main/java/datadog/trace/api/propagation/W3CTraceParent.java @@ -37,6 +37,6 @@ public static String from(DDTraceId traceId, long spanId, boolean isSampled) { } public static String from(AgentSpan span) { - return from(span.getTraceId(), span.getSpanId(), span.context().getSamplingPriority() > 0); + return from(span.getTraceId(), span.getSpanId(), span.spanContext().getSamplingPriority() > 0); } } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java index 094dc7e9fbd..46a01b3f70f 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentPropagation.java @@ -34,7 +34,7 @@ public static AgentSpanContext.Extracted extractContextAndGetSpanContext( final C carrier, final ContextVisitor getter) { Context extracted = Propagators.defaultPropagator().extract(root(), carrier, getter); AgentSpan extractedSpan = fromContext(extracted); - return extractedSpan == null ? null : (AgentSpanContext.Extracted) extractedSpan.context(); + return extractedSpan == null ? null : (AgentSpanContext.Extracted) extractedSpan.spanContext(); } public interface KeyClassifier { diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java index 99c90b53b30..0eb67f3ad52 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpan.java @@ -132,7 +132,7 @@ default boolean isValid() { boolean isSameTrace(AgentSpan otherSpan); - AgentSpanContext context(); + AgentSpanContext spanContext(); String getBaggageItem(String key); diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanContext.java index 9b993077444..1dba9438168 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanContext.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentSpanContext.java @@ -68,7 +68,7 @@ interface Extracted extends AgentSpanContext { * * @return The span links to other extracted contexts found but terminated. */ - List getTerminatedContextLinks(); + List getTerminatedSpanLinks(); String getForwarded(); diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/BlackHoleSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/BlackHoleSpan.java index 578dd7b04ae..f5e477d2054 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/BlackHoleSpan.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/BlackHoleSpan.java @@ -23,7 +23,7 @@ public DDTraceId getTraceId() { } @Override - public AgentSpanContext context() { + public AgentSpanContext spanContext() { return Context.INSTANCE; } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpan.java index 8c0013602c4..80d2331ce43 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpan.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/ExtractedSpan.java @@ -134,7 +134,7 @@ public String getBaggageItem(final String key) { } @Override - public AgentSpanContext context() { + public AgentSpanContext spanContext() { return this.spanContext; } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java index 472744fa4c2..91041164855 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpan.java @@ -104,7 +104,7 @@ public boolean isSameTrace(final AgentSpan otherSpan) { } @Override - public AgentSpanContext context() { + public AgentSpanContext spanContext() { return NoopSpanContext.INSTANCE; } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpanContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpanContext.java index 876c0167f51..43458f54928 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpanContext.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopSpanContext.java @@ -51,7 +51,7 @@ public boolean isRemote() { } @Override - public List getTerminatedContextLinks() { + public List getTerminatedSpanLinks() { return emptyList(); } diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java index 6cc277e3b22..078ffeb1625 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/TagContext.java @@ -25,7 +25,7 @@ public class TagContext implements AgentSpanContext.Extracted { private final CharSequence origin; private TagMap tags; - private List terminatedContextLinks; + private List terminatedSpanLinks; private Object requestContextDataAppSec; private Object requestContextDataIast; private Object ciVisibilityContextData; @@ -57,7 +57,7 @@ public TagContext( final DDTraceId traceId) { this.origin = origin; this.tags = tags; - this.terminatedContextLinks = null; + this.terminatedSpanLinks = null; this.httpHeaders = httpHeaders == null ? EMPTY_HTTP_HEADERS : httpHeaders; this.baggage = baggage == null ? Collections.emptyMap() : baggage; this.samplingPriority = samplingPriority; @@ -79,15 +79,15 @@ public final CharSequence getOrigin() { } @Override - public List getTerminatedContextLinks() { - return this.terminatedContextLinks == null ? emptyList() : this.terminatedContextLinks; + public List getTerminatedSpanLinks() { + return this.terminatedSpanLinks == null ? emptyList() : this.terminatedSpanLinks; } - public void addTerminatedContextLink(AgentSpanLink link) { - if (this.terminatedContextLinks == null) { - this.terminatedContextLinks = new ArrayList<>(); + public void addTerminatedSpanLink(AgentSpanLink link) { + if (this.terminatedSpanLinks == null) { + this.terminatedSpanLinks = new ArrayList<>(); } - this.terminatedContextLinks.add(link); + this.terminatedSpanLinks.add(link); } @Override diff --git a/internal-api/src/test/groovy/datadog/trace/bootstrap/instrumentation/api/ExtractedSpanTest.groovy b/internal-api/src/test/groovy/datadog/trace/bootstrap/instrumentation/api/ExtractedSpanTest.groovy index 7cdc25a22d9..81bda406fbc 100644 --- a/internal-api/src/test/groovy/datadog/trace/bootstrap/instrumentation/api/ExtractedSpanTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/bootstrap/instrumentation/api/ExtractedSpanTest.groovy @@ -16,7 +16,7 @@ class ExtractedSpanTest extends Specification { expect: extractedSpan.getTraceId() == traceId extractedSpan.getSpanId() == context.getSpanId() - extractedSpan.context() == context + extractedSpan.spanContext() == context extractedSpan.getTags() == tags extractedSpan.getTag('tag-1') == 'value-1' extractedSpan.getBaggageItem('baggage-2') == 'value-2' @@ -43,7 +43,7 @@ class ExtractedSpanTest extends Specification { expect: extractedSpan.getTraceId() == context.getTraceId() extractedSpan.getSpanId() == context.getSpanId() - extractedSpan.context() == context + extractedSpan.spanContext() == context extractedSpan.getTags().isEmpty() extractedSpan.getTag('tag-1') == null extractedSpan.getBaggageItem('baggage-2') == null