|
5 | 5 | import static datadog.trace.api.DDTags.DJM_ENABLED;
|
6 | 6 | import static datadog.trace.api.DDTags.DSM_ENABLED;
|
7 | 7 | import static datadog.trace.api.DDTags.PROFILING_CONTEXT_ENGINE;
|
| 8 | +import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.STANDALONE_ASM_CONCERN; |
8 | 9 | import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.TRACING_CONCERN;
|
9 | 10 | import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.XRAY_TRACING_CONCERN;
|
10 | 11 | import static datadog.trace.common.metrics.MetricsAggregatorFactory.createMetricsAggregator;
|
|
90 | 91 | import datadog.trace.core.propagation.ExtractedContext;
|
91 | 92 | import datadog.trace.core.propagation.HttpCodec;
|
92 | 93 | import datadog.trace.core.propagation.PropagationTags;
|
| 94 | +import datadog.trace.core.propagation.StandaloneAsmPropagator; |
93 | 95 | import datadog.trace.core.propagation.TracingPropagator;
|
94 | 96 | import datadog.trace.core.propagation.XRayPropagator;
|
95 | 97 | import datadog.trace.core.scopemanager.ContinuableScopeManager;
|
@@ -725,7 +727,14 @@ private CoreTracer(
|
725 | 727 | this.propagation =
|
726 | 728 | new CorePropagation(builtExtractor, injector, injectors, dataStreamContextInjector);
|
727 | 729 |
|
728 |
| - Propagators.register(TRACING_CONCERN, new TracingPropagator(injector, extractor)); |
| 730 | + // Check if standalone AppSec is enabled: |
| 731 | + // If enabled, use the standalone AppSec propagator by default that will limit tracing concern |
| 732 | + // injection and delegate to the tracing propagator if needed, |
| 733 | + // If disabled, the most common case, use the usual tracing propagator by default. |
| 734 | + boolean standaloneAppSec = config.isAppSecStandaloneEnabled(); |
| 735 | + Propagators.register(STANDALONE_ASM_CONCERN, new StandaloneAsmPropagator(), standaloneAppSec); |
| 736 | + Propagators.register( |
| 737 | + TRACING_CONCERN, new TracingPropagator(injector, extractor), !standaloneAppSec); |
729 | 738 | Propagators.register(XRAY_TRACING_CONCERN, new XRayPropagator(config), false);
|
730 | 739 |
|
731 | 740 | this.tagInterceptor =
|
|
0 commit comments