Merge pull request #183 from DataDog/tyler/remove-yaml-config

Remove deprecated yaml config

Author: tylerbenson

dd-trace/dd-trace.gradle

@@ -10,11 +10,9 @@ apply from: "${rootDir}/gradle/jacoco.gradle"
 minimumBranchCoverage = 0.3
 minimumInstructionCoverage = 0.5
 whitelistedInstructionClasses += whitelistedBranchClasses += [
-  "com.datadoghq.trace.integration.*",
-  'com.datadoghq.trace.resolver.TracerConfig',
-  'com.datadoghq.trace.resolver.WriterConfig',
-  'com.datadoghq.trace.resolver.DDTracerFactory',
-  'com.datadoghq.trace.resolver.SamplerConfig',
+  'com.datadoghq.trace.integration.*',
+  'com.datadoghq.trace.resolver.DecoratorsConfig',
+  'com.datadoghq.trace.writer.ListWriter',
   'com.datadoghq.trace.DDTags',
   'com.datadoghq.trace.DDTraceInfo',
   'com.datadoghq.trace.util.Clock',

dd-trace/src/main/java/com/datadoghq/trace/integration/URLAsResourceName.java

@@ -2,9 +2,8 @@
 
 import com.datadoghq.trace.DDSpanContext;
 import com.datadoghq.trace.DDTags;
-import com.datadoghq.trace.resolver.DDTracerFactory;
 import com.datadoghq.trace.resolver.FactoryUtils;
-import com.datadoghq.trace.resolver.TracerConfig;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.opentracing.tag.Tags;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
@@ -13,13 +12,14 @@
 
 /** Decorator for servlet contrib */
 public class URLAsResourceName extends AbstractDecorator {
+  public static final String CONFIG_PATH = "dd-trace";
 
   public static final Config.Rule RULE_QPARAM = new Config.Rule("\\?.*$", "");
   public static final Config.Rule RULE_DIGIT = new Config.Rule("\\d+", "?");
   private List<Config.Rule> patterns = new ArrayList<>();
 
   public URLAsResourceName() {
-    this(DDTracerFactory.CONFIG_PATH);
+    this(CONFIG_PATH);
   }
 
   public URLAsResourceName(final String configPath) {
@@ -102,8 +102,9 @@ void setPatterns(final List<Config.Rule> patterns) {
     this.patterns = patterns;
   }
 
-  /** Additional properties concerning the UrlAsResourceDecorator in the YAML config */
-  public static class Config extends TracerConfig {
+  /** Properties concerning the UrlAsResourceDecorator in the YAML config */
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  public static class Config {
 
     List<Rule> urlResourcePatterns;
 

dd-trace/src/main/java/com/datadoghq/trace/resolver/DDDecoratorsFactory.java

@@ -18,9 +18,10 @@ public class DDDecoratorsFactory {
    * @param decoratorsConfig
    * @return the list of instanciated and configured decorators
    */
-  public static List<AbstractDecorator> create(final List<DDSpanDecoratorConfig> decoratorsConfig) {
+  public static List<AbstractDecorator> create(
+      final List<DecoratorsConfig.DDSpanDecoratorConfig> decoratorsConfig) {
     final List<AbstractDecorator> decorators = new ArrayList<>();
-    for (final DDSpanDecoratorConfig decoratorConfig : decoratorsConfig) {
+    for (final DecoratorsConfig.DDSpanDecoratorConfig decoratorConfig : decoratorsConfig) {
       if (decoratorConfig.getType() == null) {
         log.warn("Cannot create decorator without type from configuration {}", decoratorConfig);
         continue;
@@ -68,8 +69,8 @@ public static List<AbstractDecorator> create(final List<DDSpanDecoratorConfig> d
 
   public static List<AbstractDecorator> createFromResources() {
     List<AbstractDecorator> result = new ArrayList<>();
-    final TracerConfig config =
-        FactoryUtils.loadConfigFromResource(CONFIG_PATH, TracerConfig.class);
+    final DecoratorsConfig config =
+        FactoryUtils.loadConfigFromResource(CONFIG_PATH, DecoratorsConfig.class);
     if (config != null) {
       result = DDDecoratorsFactory.create(config.getDecorators());
     }

dd-trace/src/main/java/com/datadoghq/trace/resolver/DDSpanDecoratorConfig.java

@@ -29,16 +29,6 @@ public static Tracer registerTracer() {
   protected Tracer resolve() {
     log.info("Creating the Datadog Tracer from the resolver");
 
-    final TracerConfig tracerConfig =
-        FactoryUtils.loadConfigFromFilePropertyOrResource(
-            DDTracerFactory.SYSTEM_PROPERTY_CONFIG_PATH,
-            DDTracerFactory.CONFIG_PATH,
-            TracerConfig.class);
-
-    if (tracerConfig != null) {
-      return DDTracerFactory.createFromConfigurationFile();
-    } else {
-      return new DDTracer();
-    }
+    return new DDTracer();
   }
 }

dd-trace/src/main/java/com/datadoghq/trace/resolver/DDTracerFactory.java

@@ -0,0 +1,92 @@
+package com.datadoghq.trace.resolver;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+class DecoratorsConfig {
+  private List<DDSpanDecoratorConfig> decorators;
+
+  public List<DDSpanDecoratorConfig> getDecorators() {
+    return decorators;
+  }
+
+  public void setDecorators(final List<DDSpanDecoratorConfig> decorators) {
+    this.decorators = decorators;
+  }
+
+  @Override
+  public String toString() {
+    try {
+      return new ObjectMapper(new YAMLFactory()).writeValueAsString(this);
+    } catch (final JsonProcessingException e) {
+      // FIXME better toString() while config object stabilized
+      return null;
+    }
+  }
+
+  static class DDSpanDecoratorConfig {
+
+    private String type;
+
+    private String matchingTag;
+
+    private String matchingValue;
+
+    private String setTag;
+
+    private String setValue;
+
+    public String getMatchingTag() {
+      return matchingTag;
+    }
+
+    public void setMatchingTag(final String matchingTag) {
+      this.matchingTag = matchingTag;
+    }
+
+    public String getMatchingValue() {
+      return matchingValue;
+    }
+
+    public void setMatchingValue(final String matchingValue) {
+      this.matchingValue = matchingValue;
+    }
+
+    public String getSetTag() {
+      return setTag;
+    }
+
+    public void setSetTag(final String setTag) {
+      this.setTag = setTag;
+    }
+
+    public String getSetValue() {
+      return setValue;
+    }
+
+    public void setSetValue(final String setValue) {
+      this.setValue = setValue;
+    }
+
+    public void setType(final String type) {
+      this.type = type;
+    }
+
+    public String getType() {
+      return type;
+    }
+
+    @Override
+    public String toString() {
+      try {
+        return new ObjectMapper(new YAMLFactory()).writeValueAsString(this);
+      } catch (final JsonProcessingException e) {
+        return null;
+      }
+    }
+  }
+}