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

Merge branch 'dev' of github.com:DataDog/dd-trace-java into dev

This commit is contained in:
renaudboutet 2017-05-29 17:33:13 +02:00
parent d20fd7788c 5e92d19114
commit 8e14d51d58
8 changed files with 324 additions and 310 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dd-java-agent/src/test/java/com/datadoghq/trace/resolver/TracerResolverTest.java
View File

@ -4,6 +4,7 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
import io.opentracing.tag.Tags;
import org.junit.Test;
import com.datadoghq.trace.DDTracer;
@ -17,19 +18,23 @@ public class TracerResolverTest {
public void test() {
DDTracerResolver tracerResolver = new DDTracerResolver();
DDTracer tracer = (DDTracer) tracerResolver.resolve();
List<DDSpanContextDecorator> decorators = tracer.getSpanContextDecorators();
// for HTTP decorators
List<DDSpanContextDecorator> decorators = tracer.getSpanContextDecorators(Tags.COMPONENT.getKey());
assertThat(decorators.size()).isEqualTo(2);
DDSpanContextDecorator decorator = decorators.get(0);
assertThat(decorator.getClass()).isEqualTo(HTTPComponent.class);
HTTPComponent httpServiceDecorator = (HTTPComponent) decorator;
assertThat(httpServiceDecorator.getMatchingTag()).isEqualTo("component");
assertThat(httpServiceDecorator.getMatchingValue()).isEqualTo("hello");
assertThat(httpServiceDecorator.getSetValue()).isEqualTo("world");
decorator = decorators.get(1);
// for URL decorators
decorators = tracer.getSpanContextDecorators(Tags.HTTP_URL.getKey());
assertThat(decorators.size()).isEqualTo(1);
decorator = decorators.get(0);
assertThat(decorator.getClass()).isEqualTo(URLAsResourceName.class);
}

3
dd-java-agent/src/test/resources/dd-trace-decorators.yaml
View File

@ -2,4 +2,7 @@ decorators:
- type: HTTPComponent
matchingValue: hello
setValue: world
- type: HTTPComponent
matchingValue: foo
setValue: bar
- type: URLAsResourceName

2
dd-trace/src/main/java/com/datadoghq/trace/DDSpanContext.java
View File

@ -175,7 +175,7 @@ public class DDSpanContext implements io.opentracing.SpanContext {
this.tags.put(tag, value);
//Call decorators
for (DDSpanContextDecorator decorator : tracer.getSpanContextDecorators()) {
for (DDSpanContextDecorator decorator : tracer.getSpanContextDecorators(tag)) {
decorator.afterSetTag(this, tag, value);
}
//Error management

560
dd-trace/src/main/java/com/datadoghq/trace/DDTracer.java
View File

@ -1,14 +1,5 @@
package com.datadoghq.trace;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.datadoghq.trace.integration.DDSpanContextDecorator;
import com.datadoghq.trace.propagation.Codec;
import com.datadoghq.trace.propagation.HTTPCodec;
@ -16,10 +7,13 @@ import com.datadoghq.trace.sampling.AllSampler;
import com.datadoghq.trace.sampling.Sampler;
import com.datadoghq.trace.writer.DDAgentWriter;
import com.datadoghq.trace.writer.Writer;
import io.opentracing.Span;
import io.opentracing.SpanContext;
import io.opentracing.propagation.Format;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.*;
/**
@ -27,316 +21,336 @@ import io.opentracing.propagation.Format;
*/
public class DDTracer implements io.opentracing.Tracer {
/**
* Writer is an charge of reporting traces and spans to the desired endpoint
*/
private Writer writer;
/**
* Sampler defines the sampling policy in order to reduce the number of traces for instance
*/
private final Sampler sampler;
/**
* Writer is an charge of reporting traces and spans to the desired endpoint
*/
private Writer writer;
/**
* Sampler defines the sampling policy in order to reduce the number of traces for instance
*/
private final Sampler sampler;
/**
* Default service name if none provided on the trace or span
*/
private final String defaultServiceName;
/**
* Default service name if none provided on the trace or span
*/
private final String defaultServiceName;
/**
* Span context decorators
*/
private final List<DDSpanContextDecorator> spanContextDecorators = new ArrayList<DDSpanContextDecorator>();
/**
* Span context decorators
*/
private final Map<String, List<DDSpanContextDecorator>> spanContextDecorators = new HashMap<>();
private final static Logger logger = LoggerFactory.getLogger(DDTracer.class);
private final CodecRegistry registry;
private final static Logger logger = LoggerFactory.getLogger(DDTracer.class);
private final CodecRegistry registry;
public static final String UNASSIGNED_DEFAULT_SERVICE_NAME = "unnamed-java-app";
public static final Writer UNASSIGNED_WRITER = new DDAgentWriter();
public static final Sampler UNASSIGNED_SAMPLER = new AllSampler();
public static final String UNASSIGNED_DEFAULT_SERVICE_NAME = "unnamed-java-app";
public static final Writer UNASSIGNED_WRITER = new DDAgentWriter();
public static final Sampler UNASSIGNED_SAMPLER = new AllSampler();
/**
* Default constructor, trace/spans are logged, no trace/span dropped
*/
public DDTracer() {
this(UNASSIGNED_WRITER);
}
/**
* Default constructor, trace/spans are logged, no trace/span dropped
*/
public DDTracer() {
this(UNASSIGNED_WRITER);
}
public DDTracer(Writer writer) {
this(writer, new AllSampler());
}
public DDTracer(Writer writer) {
this(writer, new AllSampler());
}
public DDTracer(Writer writer, Sampler sampler) {
this(UNASSIGNED_DEFAULT_SERVICE_NAME, writer, sampler);
}
public DDTracer(Writer writer, Sampler sampler) {
this(UNASSIGNED_DEFAULT_SERVICE_NAME, writer, sampler);
}
public DDTracer(String defaultServiceName, Writer writer, Sampler sampler) {
this.defaultServiceName = defaultServiceName;
this.writer = writer;
this.writer.start();
this.sampler = sampler;
registry = new CodecRegistry();
registry.register(Format.Builtin.HTTP_HEADERS, new HTTPCodec());
}
public DDTracer(String defaultServiceName, Writer writer, Sampler sampler) {
this.defaultServiceName = defaultServiceName;
this.writer = writer;
this.writer.start();
this.sampler = sampler;
registry = new CodecRegistry();
registry.register(Format.Builtin.HTTP_HEADERS, new HTTPCodec());
}
/**
* Returns the list of span context decorators
*
* @return the list of span context decorators
*/
public List<DDSpanContextDecorator> getSpanContextDecorators() {
return Collections.unmodifiableList(spanContextDecorators);
}
/**
* Returns the list of span context decorators
*
* @return the list of span context decorators
*/
public List<DDSpanContextDecorator> getSpanContextDecorators(String tag) {
List<DDSpanContextDecorator> decorators = Collections.emptyList();
String key = getHashKey(tag);
/**
* Add a new decorator in the list ({@link DDSpanContextDecorator})
*
* @param decorator The decorator in the list
*/
public void addDecorator(DDSpanContextDecorator decorator) {
spanContextDecorators.add(decorator);
}
if (spanContextDecorators.containsKey(key)) {
decorators = Collections.unmodifiableList(spanContextDecorators.get(key));
}
public DDSpanBuilder buildSpan(String operationName) {
return new DDSpanBuilder(operationName);
}
return decorators;
}
/**
* Add a new decorator in the list ({@link DDSpanContextDecorator})
*
* @param decorator The decorator in the list
*/
public void addDecorator(DDSpanContextDecorator decorator) {
String key = getHashKey(decorator.getMatchingTag());
List<DDSpanContextDecorator> list = spanContextDecorators.get(key);
if (list == null) {
list = new ArrayList<>();
}
list.add(decorator);
spanContextDecorators.put(key, list);
}
public <T> void inject(SpanContext spanContext, Format<T> format, T carrier) {
Codec<T> codec = registry.get(format);
if (codec == null) {
logger.warn("Unsupported format for propagation - {}", format.getClass().getName());
} else {
codec.inject((DDSpanContext) spanContext, carrier);
}
}
public <T> SpanContext extract(Format<T> format, T carrier) {
Codec<T> codec = registry.get(format);
if (codec == null) {
logger.warn("Unsupported format for propagation - {}", format.getClass().getName());
} else {
return codec.extract(carrier);
}
return null;
}
public DDSpanBuilder buildSpan(String operationName) {
return new DDSpanBuilder(operationName);
}
/**
* We use the sampler to know if the trace has to be reported/written.
* The sampler is called on the first span (root span) of the trace.
* If the trace is marked as a sample, we report it.
*
* @param trace a list of the spans related to the same trace
*/
public void write(List<Span> trace) {
if (trace.isEmpty()) {
return;
}
if (this.sampler.sample((DDSpan) trace.get(0))) {
this.writer.write(trace);
}
}
public <T> void inject(SpanContext spanContext, Format<T> format, T carrier) {
public void close() {
writer.close();
}
Codec<T> codec = registry.get(format);
if (codec == null) {
logger.warn("Unsupported format for propagation - {}", format.getClass().getName());
} else {
codec.inject((DDSpanContext) spanContext, carrier);
}
}
/**
* Spans are built using this builder
*/
public class DDSpanBuilder implements SpanBuilder {
public <T> SpanContext extract(Format<T> format, T carrier) {
/**
* Each span must have an operationName according to the opentracing specification
*/
private String operationName;
// Builder attributes
private Map<String, Object> tags = Collections.emptyMap();
private long timestamp;
private SpanContext parent;
private String serviceName;
private String resourceName;
private boolean errorFlag;
private String spanType;
/**
* This method actually build the span according to the builder settings
* DD-Agent requires a serviceName. If it has not been provided, the method will throw a RuntimeException
*
* @return An fresh span
*/
public DDSpan start() {
// build the context
DDSpanContext context = buildSpanContext();
DDSpan span = new DDSpan(this.timestamp, context);
logger.debug("{} - Starting a new span.", span);
return span;
}
Codec<T> codec = registry.get(format);
if (codec == null) {
logger.warn("Unsupported format for propagation - {}", format.getClass().getName());
} else {
return codec.extract(carrier);
}
return null;
}
public DDTracer.DDSpanBuilder withTag(String tag, Number number) {
return withTag(tag, (Object) number);
}
/**
* We use the sampler to know if the trace has to be reported/written.
* The sampler is called on the first span (root span) of the trace.
* If the trace is marked as a sample, we report it.
*
* @param trace a list of the spans related to the same trace
*/
public void write(List<Span> trace) {
if (trace.isEmpty()) {
return;
}
if (this.sampler.sample((DDSpan) trace.get(0))) {
this.writer.write(trace);
}
}
public DDTracer.DDSpanBuilder withTag(String tag, String string) {
if (tag.equals(DDTags.SERVICE_NAME)) {
return withServiceName(string);
} else if (tag.equals(DDTags.RESOURCE_NAME)) {
return withResourceName(string);
} else if (tag.equals(DDTags.SPAN_TYPE)) {
return withSpanType(string);
} else {
return withTag(tag, (Object) string);
}
}
public void close() {
writer.close();
}
public DDTracer.DDSpanBuilder withTag(String tag, boolean bool) {
return withTag(tag, (Object) bool);
}
/**
* Spans are built using this builder
*/
public class DDSpanBuilder implements SpanBuilder {
public DDSpanBuilder(String operationName) {
this.operationName = operationName;
}
/**
* Each span must have an operationName according to the opentracing specification
*/
private String operationName;
// Builder attributes
private Map<String, Object> tags = Collections.emptyMap();
private long timestamp;
private SpanContext parent;
private String serviceName;
private String resourceName;
private boolean errorFlag;
private String spanType;
/**
* This method actually build the span according to the builder settings
* DD-Agent requires a serviceName. If it has not been provided, the method will throw a RuntimeException
*
* @return An fresh span
*/
public DDSpan start() {
// build the context
DDSpanContext context = buildSpanContext();
DDSpan span = new DDSpan(this.timestamp, context);
logger.debug("{} - Starting a new span.", span);
return span;
}
public DDTracer.DDSpanBuilder withStartTimestamp(long timestampMillis) {
this.timestamp = timestampMillis;
return this;
}
public DDTracer.DDSpanBuilder withTag(String tag, Number number) {
return withTag(tag, (Object) number);
}
public DDTracer.DDSpanBuilder withServiceName(String serviceName) {
this.serviceName = serviceName;
return this;
}
public DDTracer.DDSpanBuilder withTag(String tag, String string) {
if (tag.equals(DDTags.SERVICE_NAME)) {
return withServiceName(string);
} else if (tag.equals(DDTags.RESOURCE_NAME)) {
return withResourceName(string);
} else if (tag.equals(DDTags.SPAN_TYPE)) {
return withSpanType(string);
} else {
return withTag(tag, (Object) string);
}
}
public DDTracer.DDSpanBuilder withResourceName(String resourceName) {
this.resourceName = resourceName;
return this;
}
public DDTracer.DDSpanBuilder withTag(String tag, boolean bool) {
return withTag(tag, (Object) bool);
}
public DDTracer.DDSpanBuilder withErrorFlag() {
this.errorFlag = true;
return this;
}
public DDSpanBuilder(String operationName) {
this.operationName = operationName;
}
public DDTracer.DDSpanBuilder withSpanType(String spanType) {
this.spanType = spanType;
return this;
}
public Iterable<Map.Entry<String, String>> baggageItems() {
if (parent == null) {
return Collections.emptyList();
}
return parent.baggageItems();
}
public DDTracer.DDSpanBuilder withStartTimestamp(long timestampMillis) {
this.timestamp = timestampMillis;
return this;
}
public DDTracer.DDSpanBuilder asChildOf(Span span) {
return asChildOf(span==null? null : span.context());
}
public DDTracer.DDSpanBuilder withServiceName(String serviceName) {
this.serviceName = serviceName;
return this;
}
public DDTracer.DDSpanBuilder asChildOf(SpanContext spanContext) {
this.parent = spanContext;
return this;
}
public DDTracer.DDSpanBuilder withResourceName(String resourceName) {
this.resourceName = resourceName;
return this;
}
public DDTracer.DDSpanBuilder addReference(String referenceType, SpanContext spanContext) {
logger.debug("`addReference` method is not implemented. Doing nothing");
return this;
}
public DDTracer.DDSpanBuilder withErrorFlag() {
this.errorFlag = true;
return this;
}
// Private methods
private DDTracer.DDSpanBuilder withTag(String tag, Object value) {
if (this.tags.isEmpty()) {
this.tags = new HashMap<String, Object>();
}
this.tags.put(tag, value);
return this;
}
public DDTracer.DDSpanBuilder withSpanType(String spanType) {
this.spanType = spanType;
return this;
}
private long generateNewId() {
return System.nanoTime();
}
public Iterable<Map.Entry<String, String>> baggageItems() {
if (parent == null) {
return Collections.emptyList();
}
return parent.baggageItems();
}
/**
* Build the SpanContext, if the actual span has a parent, the following attributes must be propagated:
* - ServiceName
* - Baggage
* - Trace (a list of all spans related)
* - SpanType
*
* @return the context
*/
private DDSpanContext buildSpanContext() {
long generatedId = generateNewId();
DDSpanContext context;
DDSpanContext p = this.parent != null ? (DDSpanContext) this.parent : null;
public DDTracer.DDSpanBuilder asChildOf(Span span) {
return asChildOf(span == null ? null : span.context());
}
String spanType = this.spanType;
if (spanType == null && this.parent != null) {
spanType = p.getSpanType();
}
public DDTracer.DDSpanBuilder asChildOf(SpanContext spanContext) {
this.parent = spanContext;
return this;
}
String serviceName = this.serviceName;
if (serviceName == null) {
if (p != null && p.getServiceName() != null) {
serviceName = p.getServiceName();
} else {
serviceName = defaultServiceName;
}
}
String operationName = this.operationName != null ? this.operationName : this.resourceName;
//this.operationName, this.tags,
public DDTracer.DDSpanBuilder addReference(String referenceType, SpanContext spanContext) {
logger.debug("`addReference` method is not implemented. Doing nothing");
return this;
}
// some attributes are inherited from the parent
context = new DDSpanContext(
this.parent == null ? generatedId : p.getTraceId(),
generatedId,
this.parent == null ? 0L : p.getSpanId(),
serviceName,
operationName,
this.resourceName,
this.parent == null ? null : p.getBaggageItems(),
errorFlag,
spanType,
this.tags,
this.parent == null ? null : p.getTrace(),
DDTracer.this
);
// Private methods
private DDTracer.DDSpanBuilder withTag(String tag, Object value) {
if (this.tags.isEmpty()) {
this.tags = new HashMap<String, Object>();
}
this.tags.put(tag, value);
return this;
}
return context;
}
private long generateNewId() {
return System.nanoTime();
}
}
/**
* Build the SpanContext, if the actual span has a parent, the following attributes must be propagated:
* - ServiceName
* - Baggage
* - Trace (a list of all spans related)
* - SpanType
*
* @return the context
*/
private DDSpanContext buildSpanContext() {
long generatedId = generateNewId();
DDSpanContext context;
DDSpanContext p = this.parent != null ? (DDSpanContext) this.parent : null;
private static class CodecRegistry {
String spanType = this.spanType;
if (spanType == null && this.parent != null) {
spanType = p.getSpanType();
}
private final Map<Format<?>, Codec<?>> codecs = new HashMap<Format<?>, Codec<?>>();
String serviceName = this.serviceName;
if (serviceName == null) {
if (p != null && p.getServiceName() != null) {
serviceName = p.getServiceName();
} else {
serviceName = defaultServiceName;
}
}
@SuppressWarnings("unchecked")
String operationName = this.operationName != null ? this.operationName : this.resourceName;
//this.operationName, this.tags,
// some attributes are inherited from the parent
context = new DDSpanContext(
this.parent == null ? generatedId : p.getTraceId(),
generatedId,
this.parent == null ? 0L : p.getSpanId(),
serviceName,
operationName,
this.resourceName,
this.parent == null ? null : p.getBaggageItems(),
errorFlag,
spanType,
this.tags,
this.parent == null ? null : p.getTrace(),
DDTracer.this
);
return context;
}
}
private String getHashKey(String tag) {
return tag;
}
private static class CodecRegistry {
private final Map<Format<?>, Codec<?>> codecs = new HashMap<Format<?>, Codec<?>>();
@SuppressWarnings("unchecked")
<T> Codec<T> get(Format<T> format) {
return (Codec<T>) codecs.get(format);
}
return (Codec<T>) codecs.get(format);
}
public <T> void register(Format<T> format, Codec<T> codec) {
codecs.put(format, codec);
}
public <T> void register(Format<T> format, Codec<T> codec) {
codecs.put(format, codec);
}
}
}
@Override
public String toString() {
return "DDTracer{" +
"writer=" + writer +
", sampler=" + sampler +
'}';
}
@Override
public String toString() {
return "DDTracer{" +
"writer=" + writer +
", sampler=" + sampler +
'}';
}
}

11
dd-trace/src/main/java/com/datadoghq/trace/integration/DBComponent.java
View File

@ -2,7 +2,6 @@ package com.datadoghq.trace.integration;
import com.datadoghq.trace.DDSpanContext;
import com.datadoghq.trace.DDTags;
import io.opentracing.tag.Tags;
/**
@ -10,7 +9,7 @@ import io.opentracing.tag.Tags;
* service name and retrieves some DB meta such as the statement
*/
public class DBComponent extends DDSpanContextDecorator {
public DBComponent() {
super();
this.setMatchingTag(Tags.COMPONENT.getKey());
@ -20,14 +19,12 @@ public class DBComponent extends DDSpanContextDecorator {
@Override
public boolean afterSetTag(DDSpanContext context, String tag, Object value) {
//Assign service name
if(super.afterSetTag(context, tag, value)){
if (super.afterSetTag(context, tag, value)) {
//Assign span type to DB
context.setSpanType("db");
//Assign resource name
if(tag.equals(Tags.DB_STATEMENT.getKey())){
context.setResourceName(String.valueOf(value));
}
context.setResourceName(String.valueOf(value));
return true;
}
return false;

10
dd-trace/src/main/java/com/datadoghq/trace/integration/DDSpanContextDecorator.java
View File

@ -15,13 +15,13 @@ public abstract class DDSpanContextDecorator {
private String setValue;
public boolean afterSetTag(DDSpanContext context, String tag, Object value){
if(tag.equals(this.getMatchingTag()) && (this.getMatchingValue()==null || value.equals(this.getMatchingValue()))){
String targetTag = getSetTag()==null?tag:getSetTag();
String targetValue = getSetValue()==null?String.valueOf(value):getSetTag();
public boolean afterSetTag(DDSpanContext context, String tag, Object value) {
if ((this.getMatchingValue() == null || value.equals(this.getMatchingValue()))) {
String targetTag = getSetTag() == null ? tag : getSetTag();
String targetValue = getSetValue() == null ? String.valueOf(value) : getSetTag();
context.setTag(targetTag, targetValue);
return true;
}else{
} else {
return false;
}
}

8
dd-trace/src/main/java/com/datadoghq/trace/integration/HTTPComponent.java
View File

@ -2,7 +2,6 @@ package com.datadoghq.trace.integration;
import com.datadoghq.trace.DDSpanContext;
import com.datadoghq.trace.DDTags;
import io.opentracing.tag.Tags;
@ -11,7 +10,7 @@ import io.opentracing.tag.Tags;
* service name and retrieves some HTTP meta such as the request path
*/
public class HTTPComponent extends DDSpanContextDecorator {
public HTTPComponent() {
super();
this.setMatchingTag(Tags.COMPONENT.getKey());
@ -21,11 +20,12 @@ public class HTTPComponent extends DDSpanContextDecorator {
@Override
public boolean afterSetTag(DDSpanContext context, String tag, Object value) {
//Assign service name
if(super.afterSetTag(context, tag, value)){
if (super.afterSetTag(context, tag, value)) {
//Assign span type to WEB
context.setSpanType("web");
return true;
}else{
} else {
return false;
}
}

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

@ -1,14 +1,13 @@
package com.datadoghq.trace.integration;
import java.net.MalformedURLException;
import com.datadoghq.trace.DDSpanContext;
import com.datadoghq.trace.DDTags;
import io.opentracing.tag.Tags;
import java.net.MalformedURLException;
public class URLAsResourceName extends DDSpanContextDecorator {
public URLAsResourceName() {
super();
this.setMatchingTag(Tags.HTTP_URL.getKey());
@ -18,17 +17,13 @@ public class URLAsResourceName extends DDSpanContextDecorator {
@Override
public boolean afterSetTag(DDSpanContext context, String tag, Object value) {
//Assign resource name
if(tag.equals(Tags.HTTP_URL.getKey())){
try {
String path = new java.net.URL(String.valueOf(value)).getPath();
context.setTag(this.getSetTag(),path);
} catch (MalformedURLException e) {
context.setResourceName(String.valueOf(value));
}
return true;
}else{
return false;
try {
String path = new java.net.URL(String.valueOf(value)).getPath();
context.setTag(this.getSetTag(), path);
} catch (MalformedURLException e) {
context.setResourceName(String.valueOf(value));
}
return true;
}
}