From c9abfa670c3da86cd389d78f1d5bb051e85a1f20 Mon Sep 17 00:00:00 2001
From: Guillaume Polaert <guillaume@logmatic.io>
Date: Wed, 26 Apr 2017 15:20:56 +0200
Subject: [PATCH] fixing merge, todo: fix nano test

---
 src/main/java/com/datadoghq/trace/impl/DDSpan.java            | 1 -
 src/main/java/com/datadoghq/trace/impl/DDSpanContext.java     | 3 ---
 src/test/java/com/datadoghq/trace/impl/DDSpanBuilderTest.java | 4 ++--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/datadoghq/trace/impl/DDSpan.java b/src/main/java/com/datadoghq/trace/impl/DDSpan.java
index 8662bc3482..c47f8526b4 100644
--- a/src/main/java/com/datadoghq/trace/impl/DDSpan.java
+++ b/src/main/java/com/datadoghq/trace/impl/DDSpan.java
@@ -8,7 +8,6 @@ import java.util.Optional;
 import com.fasterxml.jackson.annotation.JsonGetter;
 
 import io.opentracing.Span;
-import io.opentracing.SpanContext;
 
 
 public class DDSpan implements io.opentracing.Span {
diff --git a/src/main/java/com/datadoghq/trace/impl/DDSpanContext.java b/src/main/java/com/datadoghq/trace/impl/DDSpanContext.java
index 6952d47566..820677a5ef 100644
--- a/src/main/java/com/datadoghq/trace/impl/DDSpanContext.java
+++ b/src/main/java/com/datadoghq/trace/impl/DDSpanContext.java
@@ -1,9 +1,6 @@
 package com.datadoghq.trace.impl;
 
 
-import io.opentracing.Span;
-
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
diff --git a/src/test/java/com/datadoghq/trace/impl/DDSpanBuilderTest.java b/src/test/java/com/datadoghq/trace/impl/DDSpanBuilderTest.java
index 599cadea69..5d37192dc4 100644
--- a/src/test/java/com/datadoghq/trace/impl/DDSpanBuilderTest.java
+++ b/src/test/java/com/datadoghq/trace/impl/DDSpanBuilderTest.java
@@ -70,7 +70,7 @@ public class DDSpanBuilderTest {
     }
 
     @Test
-    public void shouldBuildSpanTimestampInMilli() {
+    public void shouldBuildSpanTimestampInNano() {
 
         final long expectedTimestamp = 487517802L;
         final String expectedName = "fakeName";
@@ -188,7 +188,7 @@ public class DDSpanBuilderTest {
         assertThat(span.getOperationName()).isEqualTo(expectedName);
         assertThat(span.getBaggageItem(expectedBaggageItemKey)).isEqualTo(expectedBaggageItemValue);
         assertThat(((DDSpanContext) span.context()).getServiceName()).isEqualTo(expectedServiceName);
-        assertThat(((DDSpan) span.context()).getResourceName()).isNotEqualTo(expectedResourceName);
+        assertThat(((DDSpanContext) span.context()).getResourceName()).isNotEqualTo(expectedResourceName);
 
     }