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

fixing nano

This commit is contained in:
Guillaume Polaert 2017-04-27 16:55:15 +02:00
parent f76da5df3c
commit 2273454fb7
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/datadoghq/trace/impl/DDSpan.java
View File

@ -46,31 +46,30 @@ public class DDSpan implements io.opentracing.Span {
if (this.context.getServiceName() == null) {
throw new IllegalArgumentException("No ServiceName provided");
}
logger.debug("Starting a new span. " + this.toString());
}
public void finish(long stopTimeMillis) {
// formula: millis(stop - start) * 1000 * 1000 + nano(stop - start)
// formula: millis(stop - start) * 1000 * 1000 + keepNano(nano(stop - start))
long stopTimeNano = System.nanoTime();
this.durationNano = (stopTimeMillis - startTime) * 1000000L + (stopTimeNano - this.startTimeNano);
this.durationNano = (stopTimeMillis - startTime) * 1000000L + ((stopTimeNano - this.startTimeNano) % 1000000L);
logger.debug("Finishing the span." + this.toString());
logger.debug("SPAN" + this.getSpanId() + " - Closing the span." + this.toString());
// warn if one of the parent's children is not finished
if (this.isRootSpan()) {
logger.debug("Checking all children attached to the current root span");
logger.debug("SPAN" + this.getSpanId() + " - The current span is marked as a root span");
List<Span> spans = this.context.getTrace();
logger.debug("SPAN" + this.getSpanId() + " - Checking " + spans.size() + " children attached to the current span");
for (Span span : spans) {
if (((DDSpan) span).getDurationNano() == 0L) {
// FIXME
logger.warn("The parent span is marked as finished but this span isn't. You have to close each children." + this.toString());
logger.warn("SPAN" + this.getSpanId() + " - The parent span is marked as finished but this span isn't. You have to close each children." + this.toString());
}
}
this.context.getTracer().write(this.context.getTrace());
logger.debug("Sending the trace to the writer");
logger.debug("SPAN" + this.getSpanId() + " - Sending the trace to the writer");
}
@ -164,7 +163,7 @@ public class DDSpan implements io.opentracing.Span {
@JsonGetter(value = "start")
public long getStartTime() {
return startTimeNano;
return startTime * 1000000L;
}
@JsonGetter(value = "duration")

12
src/main/java/com/datadoghq/trace/impl/DDTracer.java
View File

@ -58,15 +58,11 @@ public class DDTracer implements io.opentracing.Tracer {
// build the context
DDSpanContext context = buildTheSpanContext();
Span span = new DDSpan(this.operationName, this.tags, this.timestamp, context);
// FIXME
logger.debug("Starting new span " + this.operationName);
logger.debug("Starting a new span. " + span.toString());
return new DDSpan(
this.operationName,
this.tags,
this.timestamp,
context);
return span;
}
public DDTracer.DDSpanBuilder withTag(String tag, Number number) {
@ -165,7 +161,7 @@ public class DDTracer implements io.opentracing.Tracer {
DDTracer.this
);
logger.debug("Building a new span context." + context.toString());
logger.debug("Building a new span context. " + context.toString());
return context;
}