changes after review

Author: Cecile Terpin

dd-trace-api/src/main/java/datadog/trace/api/ConfigDefaults.java

@@ -69,8 +69,8 @@ public final class ConfigDefaults {
   static final boolean DEFAULT_DB_CLIENT_HOST_SPLIT_BY_INSTANCE_TYPE_SUFFIX = false;
   static final boolean DEFAULT_DB_CLIENT_HOST_SPLIT_BY_HOST = false;
   static final String DEFAULT_DB_DBM_PROPAGATION_MODE_MODE = "disabled";
-  // Default value is set to -1, it disables the latency trace interceptor
-  static final int DEFAULT_TRACE_LATENCY_INTERCEPTOR_VALUE = -1;
+  // Default value is set to 0, it disables the latency trace interceptor
+  static final int DEFAULT_TRACE_KEEP_LATENCY_THRESHOLD_MS = 0;
   static final int DEFAULT_SCOPE_DEPTH_LIMIT = 100;
   static final int DEFAULT_SCOPE_ITERATION_KEEP_ALIVE = 30; // in seconds
   static final int DEFAULT_PARTIAL_FLUSH_MIN_SPANS = 1000;

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

@@ -74,7 +74,7 @@ public final class TracerConfig {
 
   public static final String SPLIT_BY_TAGS = "trace.split-by-tags";
   // trace latency interceptor value should be in ms
-  public static final String TRACE_LATENCY_INTERCEPTOR_VALUE = "trace.latency.interceptor.value";
+  public static final String TRACE_KEEP_LATENCY_THRESHOLD_MS = "trace.keep.latency.threshold.ms";
   public static final String SCOPE_DEPTH_LIMIT = "trace.scope.depth.limit";
   public static final String SCOPE_STRICT_MODE = "trace.scope.strict.mode";
   public static final String SCOPE_ITERATION_KEEP_ALIVE = "trace.scope.iteration.keep.alive";

dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java

@@ -746,7 +746,7 @@ private CoreTracer(
       addTraceInterceptor(GitMetadataTraceInterceptor.INSTANCE);
     }
 
-    if (config.isTraceLatencyInterceptorEnabled()) {
+    if (config.isTraceKeepLatencyThresholdEnabled()) {
       addTraceInterceptor(LatencyTraceInterceptor.INSTANCE);
     }
 

dd-trace-core/src/main/java/datadog/trace/core/traceinterceptor/LatencyTraceInterceptor.java

@@ -9,21 +9,19 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-// This trace latency interceptor is disabled by default.
-// We can activate it by setting the value of dd.trace.latency.interceptor.value to a positive value
-// This value should be in milliseconds and this interceptor will retain any local trace who has a
-// root
-// span duration greater than this value.
-// The activation of this interceptor is ignored if partial flush is enabled in order to avoid
-// incomplete local trace (incomplete chunk of trace).
-// Note that since we're changing the sampling priority at the end of local trace, there is no
-// guarantee to get complete traces,
-// since the original sampling priority for this trace may have already been propagated.
-
+/**
+ * This trace latency interceptor is disabled by default. We can activate it by setting the value of
+ * dd.trace.latency.interceptor.value to a positive value This value should be in milliseconds and
+ * this interceptor will retain any local trace who has a root span duration greater than this
+ * value. The activation of this interceptor is ignored if partial flush is enabled in order to
+ * avoid incomplete local trace (incomplete chunk of trace). Note that since we're changing the
+ * sampling priority at the end of local trace, there is no guarantee to get complete traces, since
+ * the original sampling priority for this trace may have already been propagated.
+ */
 public class LatencyTraceInterceptor extends AbstractTraceInterceptor {
   private static final Logger log = LoggerFactory.getLogger(LatencyTraceInterceptor.class);
   // duration configured in ms, need to be converted in nano seconds
-  private static final int LATENCY = Config.get().getTraceLatencyInterceptorValue() * 1000000;
+  private static final long LATENCY = Config.get().getTraceKeepLatencyThreshold() * 1000000L;
 
   public static final TraceInterceptor INSTANCE =
       new LatencyTraceInterceptor(Priority.ROOT_SPAN_LATENCY);

dd-trace-core/src/test/groovy/datadog/trace/core/traceinterceptor/LatencyTraceInterceptorTest.groovy

@@ -15,7 +15,7 @@ class LatencyTraceInterceptorTest  extends DDCoreSpecification {
     setup:
 
     injectSysConfig("trace.partial.flush.enabled", partialFlushEnabled)
-    injectSysConfig("trace.latency.interceptor.value", latencyThreshold)
+    injectSysConfig("trace.keep.latency.threshold.ms", latencyThreshold)
 
     when:
     def writer = new ListWriter()

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

@@ -176,8 +176,8 @@ public static String getHostName() {
   private final boolean scopeStrictMode;
   private final int scopeIterationKeepAlive;
   private final int partialFlushMinSpans;
-  private final int traceLatencyInterceptorValue;
-  private final boolean traceLatencyInterceptorEnabled;
+  private final int traceKeepLatencyThreshold;
+  private final boolean traceKeepLatencyThresholdEnabled;
   private final boolean traceStrictWritesEnabled;
   private final boolean logExtractHeaderNames;
   private final Set<PropagationStyle> propagationStylesToExtract;
@@ -862,11 +862,11 @@ private Config(final ConfigProvider configProvider, final InstrumenterConfig ins
             ? 0
             : configProvider.getInteger(PARTIAL_FLUSH_MIN_SPANS, DEFAULT_PARTIAL_FLUSH_MIN_SPANS);
 
-    traceLatencyInterceptorValue =
+    traceKeepLatencyThreshold =
         configProvider.getInteger(
-            TRACE_LATENCY_INTERCEPTOR_VALUE, DEFAULT_TRACE_LATENCY_INTERCEPTOR_VALUE);
+            TRACE_KEEP_LATENCY_THRESHOLD_MS, DEFAULT_TRACE_KEEP_LATENCY_THRESHOLD_MS);
 
-    traceLatencyInterceptorEnabled = !partialFlushEnabled && (traceLatencyInterceptorValue >= 0);
+    traceKeepLatencyThresholdEnabled = !partialFlushEnabled && (traceKeepLatencyThreshold > 0);
 
     traceStrictWritesEnabled = configProvider.getBoolean(TRACE_STRICT_WRITES_ENABLED, false);
 
@@ -2083,12 +2083,12 @@ public int getPartialFlushMinSpans() {
     return partialFlushMinSpans;
   }
 
-  public int getTraceLatencyInterceptorValue() {
-    return traceLatencyInterceptorValue;
+  public int getTraceKeepLatencyThreshold() {
+    return traceKeepLatencyThreshold;
   }
 
-  public boolean isTraceLatencyInterceptorEnabled() {
-    return traceLatencyInterceptorEnabled;
+  public boolean isTraceKeepLatencyThresholdEnabled() {
+    return traceKeepLatencyThresholdEnabled;
   }
 
   public boolean isTraceStrictWritesEnabled() {
@@ -4174,10 +4174,10 @@ public String toString() {
         + scopeIterationKeepAlive
         + ", partialFlushMinSpans="
         + partialFlushMinSpans
-        + ", traceLatencyInterceptorEnabled="
-        + traceLatencyInterceptorEnabled
-        + ", traceLatencyInterceptorValue="
-        + traceLatencyInterceptorValue
+        + ", traceKeepLatencyThresholdEnabled="
+        + traceKeepLatencyThresholdEnabled
+        + ", traceKeepLatencyThreshold="
+        + traceKeepLatencyThreshold
         + ", traceStrictWritesEnabled="
         + traceStrictWritesEnabled
         + ", tracePropagationStylesToExtract="