From 4dd11b59461a7417b6c1264b740151db7e35c9a5 Mon Sep 17 00:00:00 2001
From: Guillaume Polaert <guillaume@logmatic.io>
Date: Wed, 26 Apr 2017 15:25:29 +0200
Subject: [PATCH] fix issue w/ endTime and duration

---
 .../java/com/datadoghq/trace/impl/DDSpan.java | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/datadoghq/trace/impl/DDSpan.java b/src/main/java/com/datadoghq/trace/impl/DDSpan.java
index c47f8526b4..e92ca34fe4 100644
--- a/src/main/java/com/datadoghq/trace/impl/DDSpan.java
+++ b/src/main/java/com/datadoghq/trace/impl/DDSpan.java
@@ -40,8 +40,12 @@ public class DDSpan implements io.opentracing.Span {
         this.durationNano = System.nanoTime() - startTime;
     }
 
-    public void finish(long nano) {
-        this.durationNano = nano;
+    public void finishWithDuration(long durationNano) {
+        this.durationNano = durationNano;
+    }
+
+    public void finish(long stopTime) {
+        this.durationNano = startTime - stopTime;
     }
 
     public void close() {
@@ -105,55 +109,55 @@ public class DDSpan implements io.opentracing.Span {
 
     //Getters and JSON serialisation instructions
 
-    @JsonGetter(value="name")
+    @JsonGetter(value = "name")
     public String getOperationName() {
         return operationName;
     }
 
-    @JsonGetter(value="meta")
+    @JsonGetter(value = "meta")
     public Map<String, Object> getTags() {
         return this.tags;
     }
 
-    @JsonGetter(value="start")
+    @JsonGetter(value = "start")
     public long getStartTime() {
         return startTime * 1000000;
     }
 
-    @JsonGetter(value="duration")
-    public long getDurationNano(){
-    	return durationNano;
+    @JsonGetter(value = "duration")
+    public long getDurationNano() {
+        return durationNano;
     }
 
-    public String getService(){
-    	return context.getServiceName();
+    public String getService() {
+        return context.getServiceName();
     }
 
-    @JsonGetter(value="trace_id")
-    public long getTraceId(){
-    	return context.getTraceId();
+    @JsonGetter(value = "trace_id")
+    public long getTraceId() {
+        return context.getTraceId();
     }
 
-    @JsonGetter(value="span_id")
-    public long getSpanId(){
-    	return context.getSpanId();
+    @JsonGetter(value = "span_id")
+    public long getSpanId() {
+        return context.getSpanId();
     }
 
-    @JsonGetter(value="parent_id")
-    public long getParentId(){
-    	return context.getParentId();
+    @JsonGetter(value = "parent_id")
+    public long getParentId() {
+        return context.getParentId();
     }
 
-    @JsonGetter(value="resource")
-    public String getResourceName(){
-    	return context.getResourceName()==null?getOperationName():context.getResourceName();
+    @JsonGetter(value = "resource")
+    public String getResourceName() {
+        return context.getResourceName() == null ? getOperationName() : context.getResourceName();
     }
 
-    public String getType(){
-    	return context.getSpanType();
+    public String getType() {
+        return context.getSpanType();
     }
 
-    public int getError(){
-    	return context.getErrorFlag()?1:0;
+    public int getError() {
+        return context.getErrorFlag() ? 1 : 0;
     }
 }