diff --git a/pom.xml b/pom.xml index 54bed60f72..4c68604ca9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,56 +1,71 @@ - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - com.datadog - raclette-java - 1.0-SNAPSHOT + com.datadog + raclette-java + 1.0-SNAPSHOT - - - io.opentracing - opentracing-api - 0.21.0 - - - - com.fasterxml.jackson.core - jackson-databind - 2.8.8 - + + + io.opentracing + opentracing-api + 0.21.0 + + + com.fasterxml.jackson.core + jackson-databind + 2.8.8 + - - - junit - junit - 4.12 - test - - - org.assertj - assertj-core - 3.6.2 - test - - - org.mockito - mockito-core - 2.7.22 - - + + org.slf4j + slf4j-api + 1.7.25 + + + ch.qos.logback + logback-classic + 1.2.3 + + + net.logstash.logback + logstash-logback-encoder + 4.9 + - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.8 - 1.8 - - - - + + + junit + junit + 4.12 + test + + + org.assertj + assertj-core + 3.6.2 + test + + + org.mockito + mockito-core + 2.7.22 + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + 1.8 + 1.8 + + + + \ No newline at end of file diff --git a/src/main/java/com/datadoghq/trace/Utils/TracerLogger.java b/src/main/java/com/datadoghq/trace/Utils/TracerLogger.java new file mode 100644 index 0000000000..9e34d94092 --- /dev/null +++ b/src/main/java/com/datadoghq/trace/Utils/TracerLogger.java @@ -0,0 +1,19 @@ +package com.datadoghq.trace.Utils; + + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class TracerLogger { + + private Logger logger = LoggerFactory.getLogger("com.datadoghq.trace"); + + private final String startNewSpan = "Starting new span - %s [%s]"; + + public void startNewSpan(String operationName, long spanId) { + + if (!logger.isTraceEnabled()) return; + logger.trace(String.format(startNewSpan, operationName, String.valueOf(spanId))); + } + +} diff --git a/src/main/java/com/datadoghq/trace/impl/Tracer.java b/src/main/java/com/datadoghq/trace/impl/Tracer.java index 616b97bf16..9050c74cea 100644 --- a/src/main/java/com/datadoghq/trace/impl/Tracer.java +++ b/src/main/java/com/datadoghq/trace/impl/Tracer.java @@ -1,16 +1,17 @@ package com.datadoghq.trace.impl; -import io.opentracing.References; +import com.datadoghq.trace.Utils.TracerLogger; import io.opentracing.Span; import io.opentracing.SpanContext; import io.opentracing.propagation.Format; -import sun.reflect.generics.reflectiveObjects.NotImplementedException; import java.util.*; public class Tracer implements io.opentracing.Tracer { + private TracerLogger logger = new TracerLogger(); + public SpanBuilder buildSpan(String operationName) { return new SpanBuilder(operationName); } @@ -99,6 +100,7 @@ public class Tracer implements io.opentracing.Tracer { // build the context DDSpanContext context = buildTheSpanContext(); + logger.startNewSpan(this.operationName, context.getSpanId()); return new DDSpan( Tracer.this, diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml new file mode 100644 index 0000000000..4369b7d673 --- /dev/null +++ b/src/main/resources/logback.xml @@ -0,0 +1,42 @@ + + + + + + + + + + %d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{36} - %msg%n + + + + + + ${log_directory}/dd-tracer-json.log + + + + ${log_directory}/dd-tracer-json.%d{yyyy-MM-dd}.%i.log + + + 10MB + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/java/com/datadoghq/trace/Example.java b/src/test/java/Example.java similarity index 96% rename from src/main/java/com/datadoghq/trace/Example.java rename to src/test/java/Example.java index f2bd24e9db..9ef723ad60 100644 --- a/src/main/java/com/datadoghq/trace/Example.java +++ b/src/test/java/Example.java @@ -1,6 +1,4 @@ -package com.datadoghq.trace; - - +import com.datadoghq.trace.Writer; import com.datadoghq.trace.impl.Tracer; import com.datadoghq.trace.writer.impl.DDAgentWriter; import io.opentracing.Span;