Remove sampling (#17)

Author: trask

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/instrumentation/api/Tags.java

@@ -16,7 +16,6 @@ public class Tags {
   public static final String PEER_SERVICE = "peer.service";
   public static final String PEER_HOSTNAME = "peer.hostname";
   public static final String PEER_PORT = "peer.port";
-  public static final String SAMPLING_PRIORITY = "sampling.priority";
   public static final String SPAN_KIND = "span.kind";
   public static final String COMPONENT = "component";
   public static final String ERROR = "error";

dd-java-agent/agent-tooling/agent-tooling.gradle

@@ -1,6 +1,7 @@
 apply from: "${rootDir}/gradle/java.gradle"
 
 minimumBranchCoverage = 0.6
+minimumInstructionCoverage = 0.8
 excludedClassesCoverage += ['datadog.trace.agent.tooling.*']
 
 configurations {

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/decorator/BaseDecorator.java

@@ -1,6 +1,5 @@
 package datadog.trace.agent.decorator;
 
-import datadog.trace.api.Config;
 import datadog.trace.api.DDTags;
 import datadog.trace.instrumentation.api.AgentScope;
 import datadog.trace.instrumentation.api.AgentSpan;
@@ -10,44 +9,24 @@
 import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.util.Arrays;
-import java.util.TreeSet;
 import java.util.concurrent.ExecutionException;
 
 public abstract class BaseDecorator {
 
-  protected final boolean traceAnalyticsEnabled;
-  protected final float traceAnalyticsSampleRate;
-
-  protected BaseDecorator() {
-    final Config config = Config.get();
-    final String[] instrumentationNames = instrumentationNames();
-    traceAnalyticsEnabled =
-        instrumentationNames.length > 0
-            && config.isTraceAnalyticsIntegrationEnabled(
-                new TreeSet<>(Arrays.asList(instrumentationNames)), traceAnalyticsDefault());
-    traceAnalyticsSampleRate = config.getInstrumentationAnalyticsSampleRate(instrumentationNames);
-  }
+  protected BaseDecorator() {}
 
   protected abstract String[] instrumentationNames();
 
   protected abstract String spanType();
 
   protected abstract String component();
 
-  protected boolean traceAnalyticsDefault() {
-    return false;
-  }
-
   public AgentSpan afterStart(final AgentSpan span) {
     assert span != null;
     if (spanType() != null) {
       span.setTag(DDTags.SPAN_TYPE, spanType());
     }
     span.setTag(Tags.COMPONENT.getKey(), component());
-    if (traceAnalyticsEnabled) {
-      span.setTag(DDTags.ANALYTICS_SAMPLE_RATE, traceAnalyticsSampleRate);
-    }
     return span;
   }
 

dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/decorator/HttpServerDecorator.java

@@ -36,11 +36,6 @@ protected String spanType() {
     return DDSpanTypes.HTTP_SERVER;
   }
 
-  @Override
-  protected boolean traceAnalyticsDefault() {
-    return Config.get().isTraceAnalyticsEnabled();
-  }
-
   public AgentSpan onRequest(final AgentSpan span, final REQUEST request) {
     assert span != null;
     if (request != null) {

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/BaseDecoratorTest.groovy

@@ -1,6 +1,6 @@
 package datadog.trace.agent.decorator
 
-import datadog.trace.agent.test.utils.ConfigUtils
+
 import datadog.trace.api.DDTags
 import datadog.trace.instrumentation.api.AgentScope
 import datadog.trace.instrumentation.api.AgentSpan
@@ -139,51 +139,6 @@ class BaseDecoratorTest extends DDSpecification {
     1 * scope.span() >> span
   }
 
-  def "test analytics rate default disabled"() {
-    when:
-    BaseDecorator dec = newDecorator(defaultEnabled, hasConfigNames)
-
-    then:
-    dec.traceAnalyticsEnabled == defaultEnabled
-    dec.traceAnalyticsSampleRate == sampleRate.floatValue()
-
-    where:
-    defaultEnabled | hasConfigNames | sampleRate
-    true           | false          | 1.0
-    false          | false          | 1.0
-    false          | true           | 1.0
-  }
-
-  def "test analytics rate enabled:#enabled, integration:#integName, sampleRate:#sampleRate"() {
-    setup:
-    ConfigUtils.updateConfig {
-      System.properties.setProperty("dd.${integName}.analytics.enabled", "true")
-      System.properties.setProperty("dd.${integName}.analytics.sample-rate", "$sampleRate")
-    }
-
-    when:
-    BaseDecorator dec = newDecorator(enabled)
-
-    then:
-    dec.traceAnalyticsEnabled == expectedEnabled
-    dec.traceAnalyticsSampleRate == (Float) expectedRate
-
-    cleanup:
-    System.clearProperty("dd.${integName}.analytics.enabled")
-    System.clearProperty("dd.${integName}.analytics.sample-rate")
-
-    where:
-    enabled | integName | sampleRate | expectedEnabled | expectedRate
-    false   | ""        | ""         | false           | 1.0
-    true    | ""        | ""         | true            | 1.0
-    false   | "test1"   | 0.5        | true            | 0.5
-    false   | "test2"   | 0.75       | true            | 0.75
-    true    | "test1"   | 0.2        | true            | 0.2
-    true    | "test2"   | 0.4        | true            | 0.4
-    true    | "test1"   | ""         | true            | 1.0
-    true    | "test2"   | ""         | true            | 1.0
-  }
-
   def "test spanNameForMethod"() {
     when:
     def result = decorator.spanNameForMethod(method)
@@ -201,68 +156,22 @@ class BaseDecoratorTest extends DDSpecification {
   }
 
   def newDecorator() {
-    return newDecorator(false)
-  }
-
-  def newDecorator(boolean analyticsEnabledDefault, boolean emptyInstrumentationNames = false) {
-    return emptyInstrumentationNames ?
-      new BaseDecorator() {
-        @Override
-        protected String[] instrumentationNames() {
-          return []
-        }
-
-        @Override
-        protected String spanType() {
-          return "test-type"
-        }
-
-        @Override
-        protected String component() {
-          return "test-component"
-        }
-
-        protected boolean traceAnalyticsDefault() {
-          return true
-        }
-      } :
-      analyticsEnabledDefault ?
-        new BaseDecorator() {
-          @Override
-          protected String[] instrumentationNames() {
-            return ["test1", "test2"]
-          }
-
-          @Override
-          protected String spanType() {
-            return "test-type"
-          }
-
-          @Override
-          protected String component() {
-            return "test-component"
-          }
-
-          protected boolean traceAnalyticsDefault() {
-            return true
-          }
-        } :
-        new BaseDecorator() {
-          @Override
-          protected String[] instrumentationNames() {
-            return ["test1", "test2"]
-          }
-
-          @Override
-          protected String spanType() {
-            return "test-type"
-          }
-
-          @Override
-          protected String component() {
-            return "test-component"
-          }
-        }
+    return new BaseDecorator() {
+      @Override
+      protected String[] instrumentationNames() {
+        return []
+      }
+
+      @Override
+      protected String spanType() {
+        return "test-type"
+      }
+
+      @Override
+      protected String component() {
+        return "test-component"
+      }
+    }
   }
 
   class SomeInnerClass implements Runnable {

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/ClientDecoratorTest.groovy

@@ -22,7 +22,6 @@ class ClientDecoratorTest extends BaseDecoratorTest {
     1 * span.setTag(Tags.COMPONENT.key, "test-component")
     1 * span.setTag(Tags.SPAN_KIND.key, "client")
     1 * span.setTag(DDTags.SPAN_TYPE, decorator.spanType())
-    1 * span.setTag(DDTags.ANALYTICS_SAMPLE_RATE, 1.0)
     _ * span.setTag(_, _) // Want to allow other calls from child implementations.
     0 * _
 
@@ -64,10 +63,6 @@ class ClientDecoratorTest extends BaseDecoratorTest {
       protected String component() {
         return "test-component"
       }
-
-      protected boolean traceAnalyticsDefault() {
-        return true
-      }
     }
   }
 }

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/DatabaseClientDecoratorTest.groovy

@@ -26,7 +26,6 @@ class DatabaseClientDecoratorTest extends ClientDecoratorTest {
     1 * span.setTag(Tags.SPAN_KIND.key, "client")
     1 * span.setTag(Tags.DB_TYPE.key, "test-db")
     1 * span.setTag(DDTags.SPAN_TYPE, "test-type")
-    1 * span.setTag(DDTags.ANALYTICS_SAMPLE_RATE, 1.0)
     0 * _
 
     where:
@@ -138,10 +137,6 @@ class DatabaseClientDecoratorTest extends ClientDecoratorTest {
       protected String dbInstance(Map map) {
         return map.instance
       }
-
-      protected boolean traceAnalyticsDefault() {
-        return true
-      }
     }
   }
 }

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/HttpClientDecoratorTest.groovy

@@ -174,10 +174,6 @@ class HttpClientDecoratorTest extends ClientDecoratorTest {
       protected Integer status(Map m) {
         return m.status
       }
-
-      protected boolean traceAnalyticsDefault() {
-        return true
-      }
     }
   }
 }

dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/decorator/ServerDecoratorTest.groovy

@@ -19,9 +19,6 @@ class ServerDecoratorTest extends BaseDecoratorTest {
     1 * span.setTag(Tags.COMPONENT.key, "test-component")
     1 * span.setTag(Tags.SPAN_KIND.key, "server")
     1 * span.setTag(DDTags.SPAN_TYPE, decorator.spanType())
-    if (decorator.traceAnalyticsEnabled) {
-      1 * span.setTag(DDTags.ANALYTICS_SAMPLE_RATE, 1.0)
-    }
     0 * _
   }
 
@@ -50,10 +47,6 @@ class ServerDecoratorTest extends BaseDecoratorTest {
       protected String component() {
         return "test-component"
       }
-
-      protected boolean traceAnalyticsDefault() {
-        return true
-      }
     }
   }
 }

dd-java-agent/instrumentation/ratpack-1.4/src/main/java8/datadog/trace/instrumentation/ratpack/RatpackServerDecorator.java

@@ -26,11 +26,6 @@ protected String component() {
     return "ratpack";
   }
 
-  @Override
-  protected boolean traceAnalyticsDefault() {
-    return false;
-  }
-
   @Override
   protected String method(final Request request) {
     return request.getMethod().getName();

dd-java-agent/instrumentation/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringWebHttpServerDecorator.java

@@ -38,11 +38,6 @@ protected String component() {
     return "spring-web-controller";
   }
 
-  @Override
-  protected boolean traceAnalyticsDefault() {
-    return false;
-  }
-
   @Override
   protected String method(final HttpServletRequest httpServletRequest) {
     return httpServletRequest.getMethod();

dd-java-agent/testing/src/test/groovy/context/FieldBackedProviderTest.groovy

@@ -215,7 +215,6 @@ class FieldBackedProviderFieldInjectionDisabledTest extends AgentTestRunner {
     }
 
     expect:
-    Config.get().isPrioritySamplingEnabled() == false
     hasField == false
     hasMarkerInterface == false
     hasAccessorInterface == false