Skip to content

Do not allocate a tracing context when not fully extracted #9693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amarziali merged 3 commits into from
Oct 16, 2025
Merged

Do not allocate a tracing context when not fully extracted #9693

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9c634ef
OTEL: don't return a span if not valid
amarziali Oct 8, 2025
1c997f9
suggestions
amarziali Oct 8, 2025
66a1ee4
feat(otel): Improving test
PerfectSlayer Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...nt/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/context/OtelContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public Scope makeCurrent() {
public <V> V get(ContextKey<V> key) {
if (OTEL_CONTEXT_SPAN_KEY.equals(key.toString())) {
AgentSpan span = AgentSpan.fromContext(delegate);
if (span != null) {
if (span != null && span.isValid()) {
return (V) toOtelSpan(span);
}
// fall-through and check for non-datadog span data
Expand Down
9 changes: 9 additions & 0 deletions ...try-1.4/src/test/groovy/opentelemetry14/context/propagation/AbstractPropagatorTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import datadog.trace.agent.test.InstrumentationSpecification
import datadog.trace.api.DDSpanId
import datadog.trace.api.DDTraceId
import io.opentelemetry.api.GlobalOpenTelemetry
import io.opentelemetry.api.trace.Span
import io.opentelemetry.context.Context
import io.opentelemetry.context.ThreadLocalContextStorage
import io.opentelemetry.context.propagation.TextMapPropagator
Expand Down Expand Up @@ -102,6 +103,14 @@ abstract class AbstractPropagatorTest extends InstrumentationSpecification {
(headers, traceId, spanId, sampling) = values
}

def "extraction on missing tracecontext should return an empty context"() {
when:
def headers = ["User-Agent":"test"]
def context = propagator().extract(Context.root(), headers, TextMap.INSTANCE)
then:
assert Span.fromContextOrNull(context) == null : "Should not have a tracing context"
}

def expectedTraceId(String traceId) {
return DDTraceId.fromHex(traceId)
}
Expand Down