open-telemetry
/
opentelemetry-java-instrumentation
mirror of https://github.com/open-telemetry/opentelemetry-java-instrumentation.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add default config values to the yaml config

This commit is contained in:
Tyler Benson 2017-07-31 12:57:01 -07:00
parent f56418e82a
commit ee42316988
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dd-trace/src/main/java/com/datadoghq/trace/resolver/TracerConfig.java
View File

@ -1,5 +1,6 @@
package com.datadoghq.trace.resolver; package com.datadoghq.trace.resolver;
import com.datadoghq.trace.writer.DDAgentWriter;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
@ -12,8 +13,8 @@ import java.util.Map;
public class TracerConfig { public class TracerConfig {
private String defaultServiceName; private String defaultServiceName;
private WriterConfig writer; private WriterConfig writer = new WriterConfig();
private SamplerConfig sampler; private SamplerConfig sampler = new SamplerConfig();
private List<DDSpanDecoratorConfig> decorators; private List<DDSpanDecoratorConfig> decorators;
public String getDefaultServiceName() { public String getDefaultServiceName() {
@ -62,7 +63,7 @@ public class TracerConfig {
class SamplerConfig { class SamplerConfig {
private Double rate; private Double rate;
private String type; private String type = "AllSampler";
private Map<String, String> skipTagsPatterns; private Map<String, String> skipTagsPatterns;
public String getType() { public String getType() {
@ -88,9 +89,9 @@ class SamplerConfig {
class WriterConfig { class WriterConfig {
private String host; private String host = "localhost";
private Integer port; private Integer port = 8126;
private String type; private String type = DDAgentWriter.class.getSimpleName();
public void setHost(final String host) { public void setHost(final String host) {
this.host = host; this.host = host;

15
dd-trace/src/test/java/com/datadoghq/trace/resolver/DDTracerFactoryTest.java
View File

@ -9,6 +9,21 @@ import org.junit.Test;
public class DDTracerFactoryTest { 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 @Test
public void test() throws Exception { public void test() throws Exception {
TracerConfig tracerConfig = TracerConfig tracerConfig =

1
dd-trace/src/test/resources/dd-trace-default.yaml Normal file
View File

@ -0,0 +1 @@
defaultServiceName: java-app-default