Fixed serialization and send to DDagent
This commit is contained in:
parent
ef6dccc7ca
commit
81656a2b20
|
@ -1,12 +1,12 @@
|
||||||
package com.datadoghq.trace.impl;
|
package com.datadoghq.trace.impl;
|
||||||
|
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonGetter;
|
import com.fasterxml.jackson.annotation.JsonGetter;
|
||||||
|
|
||||||
import io.opentracing.Span;
|
import io.opentracing.Span;
|
||||||
import io.opentracing.SpanContext;
|
import io.opentracing.SpanContext;
|
||||||
|
|
||||||
import java.util.Map;
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
|
|
||||||
public class DDSpan implements io.opentracing.Span {
|
public class DDSpan implements io.opentracing.Span {
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@ public class DDSpan implements io.opentracing.Span {
|
||||||
protected String operationName;
|
protected String operationName;
|
||||||
protected Map<String, Object> tags;
|
protected Map<String, Object> tags;
|
||||||
protected long startTime;
|
protected long startTime;
|
||||||
|
protected long startTimeNano; // Only used to measure nano time durations
|
||||||
protected long durationNano;
|
protected long durationNano;
|
||||||
protected final DDSpanContext context;
|
protected final DDSpanContext context;
|
||||||
|
|
||||||
|
@ -26,7 +27,8 @@ public class DDSpan implements io.opentracing.Span {
|
||||||
this.tracer = tracer;
|
this.tracer = tracer;
|
||||||
this.operationName = operationName;
|
this.operationName = operationName;
|
||||||
this.tags = tags;
|
this.tags = tags;
|
||||||
this.startTime = Optional.ofNullable(timestamp).orElse(System.nanoTime());
|
this.startTime = System.currentTimeMillis()*1000000;
|
||||||
|
this.startTimeNano = System.nanoTime();
|
||||||
this.context = context;
|
this.context = context;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -35,15 +37,11 @@ public class DDSpan implements io.opentracing.Span {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void finish() {
|
public void finish() {
|
||||||
this.durationNano = System.nanoTime() - startTime;
|
this.durationNano = System.nanoTime() - startTimeNano;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void finishWithDuration(long durationNano) {
|
public void finish(long stopTimeMicro) {
|
||||||
this.durationNano = durationNano;
|
this.durationNano = stopTimeMicro * 1000L - startTime;
|
||||||
}
|
|
||||||
|
|
||||||
public void finish(long stopTime) {
|
|
||||||
this.durationNano = startTime - stopTime;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void close() {
|
public void close() {
|
||||||
|
|
|
@ -119,8 +119,8 @@ public class DDApi {
|
||||||
|
|
||||||
DDApi api = new DDApi(DDAgentWriter.DEFAULT_HOSTNAME, DDAgentWriter.DEFAULT_PORT);
|
DDApi api = new DDApi(DDAgentWriter.DEFAULT_HOSTNAME, DDAgentWriter.DEFAULT_PORT);
|
||||||
|
|
||||||
String service = "{\"service_name\": {\"app\": \"service-name\",\"app_type\": \"web\"}}";
|
// String service = "{\"service_name\": {\"app\": \"service-name\",\"app_type\": \"web\"}}";
|
||||||
System.out.println("Pushed service: "+api.callPUT(api.servicesEndpoint, service));
|
// System.out.println("Pushed service: "+api.callPUT(api.servicesEndpoint, service));
|
||||||
System.out.println("Pushed traces: "+api.sendTraces(traces));
|
System.out.println("Pushed traces: "+api.sendTraces(traces));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue