From ee42316988e06099f5a60ab60ed896eac50989df Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Mon, 31 Jul 2017 12:57:01 -0700 Subject: [PATCH] Add default config values to the yaml config --- .../datadoghq/trace/resolver/TracerConfig.java | 13 +++++++------ .../trace/resolver/DDTracerFactoryTest.java | 15 +++++++++++++++ dd-trace/src/test/resources/dd-trace-default.yaml | 1 + 3 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 dd-trace/src/test/resources/dd-trace-default.yaml diff --git a/dd-trace/src/main/java/com/datadoghq/trace/resolver/TracerConfig.java b/dd-trace/src/main/java/com/datadoghq/trace/resolver/TracerConfig.java index a956b38dbc..82137657f8 100644 --- a/dd-trace/src/main/java/com/datadoghq/trace/resolver/TracerConfig.java +++ b/dd-trace/src/main/java/com/datadoghq/trace/resolver/TracerConfig.java @@ -1,5 +1,6 @@ package com.datadoghq.trace.resolver; +import com.datadoghq.trace.writer.DDAgentWriter; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -12,8 +13,8 @@ import java.util.Map; public class TracerConfig { private String defaultServiceName; - private WriterConfig writer; - private SamplerConfig sampler; + private WriterConfig writer = new WriterConfig(); + private SamplerConfig sampler = new SamplerConfig(); private List decorators; public String getDefaultServiceName() { @@ -62,7 +63,7 @@ public class TracerConfig { class SamplerConfig { private Double rate; - private String type; + private String type = "AllSampler"; private Map skipTagsPatterns; public String getType() { @@ -88,9 +89,9 @@ class SamplerConfig { class WriterConfig { - private String host; - private Integer port; - private String type; + private String host = "localhost"; + private Integer port = 8126; + private String type = DDAgentWriter.class.getSimpleName(); public void setHost(final String host) { this.host = host; diff --git a/dd-trace/src/test/java/com/datadoghq/trace/resolver/DDTracerFactoryTest.java b/dd-trace/src/test/java/com/datadoghq/trace/resolver/DDTracerFactoryTest.java index 864a594240..4ef01fc9d4 100644 --- a/dd-trace/src/test/java/com/datadoghq/trace/resolver/DDTracerFactoryTest.java +++ b/dd-trace/src/test/java/com/datadoghq/trace/resolver/DDTracerFactoryTest.java @@ -9,6 +9,21 @@ import org.junit.Test; public class DDTracerFactoryTest { + @Test + public void testDefaults() throws Exception { + final TracerConfig tracerConfig = + FactoryUtils.loadConfigFromResource("dd-trace-default.yaml", TracerConfig.class); + + assertThat(tracerConfig.getWriter()).isNotNull(); + assertThat(tracerConfig.getSampler()).isNotNull(); + assertThat(tracerConfig.getDefaultServiceName()).isEqualTo("java-app-default"); + assertThat(tracerConfig.getWriter().getHost()).isEqualTo("localhost"); + assertThat(tracerConfig.getWriter().getPort()).isEqualTo(8126); + assertThat(tracerConfig.getWriter().getType()).isEqualTo(DDAgentWriter.class.getSimpleName()); + assertThat(tracerConfig.getSampler().getType()).isEqualTo(AllSampler.class.getSimpleName()); + assertThat(tracerConfig.getSampler().getRate()).isNull(); + } + @Test public void test() throws Exception { TracerConfig tracerConfig = diff --git a/dd-trace/src/test/resources/dd-trace-default.yaml b/dd-trace/src/test/resources/dd-trace-default.yaml new file mode 100644 index 0000000000..e5cf339b08 --- /dev/null +++ b/dd-trace/src/test/resources/dd-trace-default.yaml @@ -0,0 +1 @@ +defaultServiceName: java-app-default