Skip to content

Commit c9193aa

Browse files
Removed option to disable post-processing
1 parent 3a8beca commit c9193aa

File tree

3 files changed

+1
-18
lines changed

3 files changed

+1
-18
lines changed

dd-trace-api/src/main/java/datadog/trace/api/config/TracerConfig.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,8 +133,6 @@ public final class TracerConfig {
133133

134134
public static final String TRACE_FLUSH_INTERVAL = "trace.flush.interval";
135135

136-
public static final String TRACE_POST_PROCESSING_ENABLED = "trace.post-processing.enabled";
137-
138136
public static final String TRACE_POST_PROCESSING_TIMEOUT = "trace.post-processing.timeout";
139137

140138
private TracerConfig() {}

dd-trace-core/src/main/java/datadog/trace/common/writer/TraceProcessingWorker.java

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.concurrent.CountDownLatch;
2222
import java.util.concurrent.TimeUnit;
2323
import java.util.function.BooleanSupplier;
24-
2524
import org.jctools.queues.MessagePassingQueue;
2625
import org.jctools.queues.MpscBlockingConsumerArrayQueue;
2726
import org.slf4j.Logger;
@@ -305,10 +304,6 @@ protected boolean queuesAreEmpty() {
305304
}
306305

307306
private void maybeTracePostProcessing(List<DDSpan> trace) {
308-
if (!Config.get().isTracePostProcessingEnabled()) {
309-
return;
310-
}
311-
312307
if (trace == null || trace.isEmpty()) {
313308
return;
314309
}
@@ -320,8 +315,7 @@ private void maybeTracePostProcessing(List<DDSpan> trace) {
320315

321316
long timeout = Config.get().getTracePostProcessingTimeout();
322317
long deadline = System.currentTimeMillis() + timeout;
323-
BooleanSupplier timeoutCheck =
324-
() -> System.currentTimeMillis() > deadline;
318+
BooleanSupplier timeoutCheck = () -> System.currentTimeMillis() > deadline;
325319

326320
if (!tracePostProcessor.process(trace, context, timeoutCheck)) {
327321
log.debug("Trace post-processing is interrupted due to timeout.");

internal-api/src/main/java/datadog/trace/api/Config.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,6 @@
434434
import static datadog.trace.api.config.TracerConfig.TRACE_PEER_SERVICE_COMPONENT_OVERRIDES;
435435
import static datadog.trace.api.config.TracerConfig.TRACE_PEER_SERVICE_DEFAULTS_ENABLED;
436436
import static datadog.trace.api.config.TracerConfig.TRACE_PEER_SERVICE_MAPPING;
437-
import static datadog.trace.api.config.TracerConfig.TRACE_POST_PROCESSING_ENABLED;
438437
import static datadog.trace.api.config.TracerConfig.TRACE_POST_PROCESSING_TIMEOUT;
439438
import static datadog.trace.api.config.TracerConfig.TRACE_PROPAGATION_EXTRACT_FIRST;
440439
import static datadog.trace.api.config.TracerConfig.TRACE_PROPAGATION_STYLE;
@@ -926,7 +925,6 @@ static class HostNameHolder {
926925

927926
private final boolean axisPromoteResourceName;
928927
private final float traceFlushIntervalSeconds;
929-
private final boolean tracePostProcessingEnabled;
930928
private final long tracePostProcessingTimeout;
931929

932930
private final boolean telemetryDebugRequestsEnabled;
@@ -2040,9 +2038,6 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment())
20402038
"Agentless profiling activated but no api key provided. Profile uploading will likely fail");
20412039
}
20422040

2043-
this.tracePostProcessingEnabled =
2044-
configProvider.getBoolean(TRACE_POST_PROCESSING_ENABLED, true);
2045-
20462041
this.tracePostProcessingTimeout = configProvider.getLong(TRACE_POST_PROCESSING_TIMEOUT, 1000);
20472042

20482043
if (isCiVisibilityEnabled()
@@ -2145,10 +2140,6 @@ public float getTraceFlushIntervalSeconds() {
21452140
return traceFlushIntervalSeconds;
21462141
}
21472142

2148-
public boolean isTracePostProcessingEnabled() {
2149-
return tracePostProcessingEnabled;
2150-
}
2151-
21522143
public long getTracePostProcessingTimeout() {
21532144
return tracePostProcessingTimeout;
21542145
}

0 commit comments

Comments
 (0)