fixing merge, todo: fix nano test
MODIFY
src/main/java/com/datadoghq/trace/impl/DDSpan.java
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 {

MODIFY
src/main/java/com/datadoghq/trace/impl/DDSpanContext.java
src/main/java/com/datadoghq/trace/impl/DDSpanContext.java
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;

MODIFY
src/test/java/com/datadoghq/trace/impl/DDSpanBuilderTest.java
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);
}

fixing merge, todo: fix nano test