-
Notifications
You must be signed in to change notification settings - Fork 339
Support baggage propagation without enabling tracing #11624
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.
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
Open
aviramha
wants to merge
2
commits into
DataDog:master
Choose a base branch
from
aviramha:baggage
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
dd-trace-core/src/main/java/datadog/trace/common/writer/NoOpWriter.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| package datadog.trace.common.writer; | ||
|
|
||
| import datadog.trace.core.DDSpan; | ||
| import java.util.List; | ||
|
|
||
| /** | ||
| * A writer that discards all traces. Used when the tracer is only installed to propagate context | ||
| * (see {@code TraceInstrumentationConfig.PROPAGATE_CONTEXT}) and no trace data must be reported. | ||
| */ | ||
| public class NoOpWriter implements Writer { | ||
|
|
||
| @Override | ||
| public void write(final List<DDSpan> trace) {} | ||
|
|
||
| @Override | ||
| public void start() {} | ||
|
|
||
| @Override | ||
| public boolean flush() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public void close() {} | ||
|
|
||
| @Override | ||
| public void incrementDropCounts(int spanCount) {} | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "NoOpWriter { }"; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
dd-trace-core/src/test/java/datadog/trace/core/ContextPropagationOnlyTest.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package datadog.trace.core; | ||
|
|
||
| import static org.junit.jupiter.api.Assertions.assertFalse; | ||
| import static org.junit.jupiter.api.Assertions.assertInstanceOf; | ||
| import static org.junit.jupiter.api.Assertions.assertNotNull; | ||
| import static org.junit.jupiter.api.Assertions.assertTrue; | ||
|
|
||
| import datadog.context.Context; | ||
| import datadog.context.propagation.Propagators; | ||
| import datadog.trace.api.config.TraceInstrumentationConfig; | ||
| import datadog.trace.bootstrap.instrumentation.api.AgentSpan; | ||
| import datadog.trace.common.writer.DDAgentWriter; | ||
| import datadog.trace.common.writer.NoOpWriter; | ||
| import datadog.trace.junit.utils.config.WithConfig; | ||
| import java.util.HashMap; | ||
| import java.util.Map; | ||
| import java.util.concurrent.TimeUnit; | ||
| import org.junit.jupiter.api.Test; | ||
| import org.junit.jupiter.api.Timeout; | ||
|
|
||
| /** | ||
| * Tests for the propagate-only mode enabled by DD_PROPAGATE_CONTEXT: context propagation stays | ||
| * active while no trace data is reported to Datadog. | ||
| */ | ||
| @Timeout(value = 10, unit = TimeUnit.SECONDS) | ||
| class ContextPropagationOnlyTest extends DDCoreJavaSpecification { | ||
|
|
||
| @Test | ||
| @WithConfig(key = TraceInstrumentationConfig.TRACE_ENABLED, value = "false") | ||
| @WithConfig(key = TraceInstrumentationConfig.PROPAGATE_CONTEXT, value = "true") | ||
| void verifyPropagateOnlyModeDoesNotReportTraces() { | ||
| CoreTracer tracer = tracerBuilder().build(); | ||
|
|
||
| assertInstanceOf(NoOpWriter.class, tracer.writer); | ||
| assertFalse(tracer.captureTraceConfig().isTraceEnabled()); | ||
| } | ||
|
|
||
| @Test | ||
| @WithConfig(key = TraceInstrumentationConfig.TRACE_ENABLED, value = "false") | ||
| @WithConfig(key = TraceInstrumentationConfig.PROPAGATE_CONTEXT, value = "true") | ||
| void verifyPropagateOnlyModeStillInjectsContext() { | ||
| CoreTracer tracer = tracerBuilder().build(); | ||
| AgentSpan span = tracer.buildSpan("test", "operation").start(); | ||
| try { | ||
| Map<String, String> carrier = new HashMap<>(); | ||
| Propagators.defaultPropagator().inject(Context.root().with(span), carrier, Map::put); | ||
|
|
||
| assertNotNull(carrier.get("traceparent"), "traceparent missing: " + carrier); | ||
| assertNotNull(carrier.get("x-datadog-trace-id"), "x-datadog-trace-id missing: " + carrier); | ||
| assertTrue( | ||
| carrier.get("traceparent").contains(span.context().getTraceId().toHexString()), | ||
| "traceparent does not match trace id: " + carrier); | ||
| } finally { | ||
| span.finish(); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| @WithConfig(key = TraceInstrumentationConfig.PROPAGATE_CONTEXT, value = "true") | ||
| void verifyFlagHasNoEffectWhenTracingEnabled() { | ||
| CoreTracer tracer = tracerBuilder().build(); | ||
|
|
||
| assertInstanceOf(DDAgentWriter.class, tracer.writer); | ||
| assertTrue(tracer.captureTraceConfig().isTraceEnabled()); | ||
| } | ||
|
|
||
| @Test | ||
| @WithConfig(key = TraceInstrumentationConfig.TRACE_ENABLED, value = "false") | ||
| void verifyTracingDisabledWithoutFlagKeepsCurrentBehavior() { | ||
| CoreTracer tracer = tracerBuilder().build(); | ||
|
|
||
| assertInstanceOf(DDAgentWriter.class, tracer.writer); | ||
| assertTrue(tracer.captureTraceConfig().isTraceEnabled()); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.