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 merge, todo: fix nano test

This commit is contained in:
Guillaume Polaert 2017-04-26 15:20:56 +02:00
parent ee9f91219b
commit c9abfa670c
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,7 +8,6 @@ import java.util.Optional;
import com.fasterxml.jackson.annotation.JsonGetter; import com.fasterxml.jackson.annotation.JsonGetter;
import io.opentracing.Span; import io.opentracing.Span;
import io.opentracing.SpanContext;
public class DDSpan implements io.opentracing.Span { public class DDSpan implements io.opentracing.Span {

3
src/main/java/com/datadoghq/trace/impl/DDSpanContext.java
View File

@ -1,9 +1,6 @@
package com.datadoghq.trace.impl; package com.datadoghq.trace.impl;
import io.opentracing.Span;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;

4
src/test/java/com/datadoghq/trace/impl/DDSpanBuilderTest.java
View File

@ -70,7 +70,7 @@ public class DDSpanBuilderTest {
} }
@Test @Test
public void shouldBuildSpanTimestampInMilli() { public void shouldBuildSpanTimestampInNano() {
final long expectedTimestamp = 487517802L; final long expectedTimestamp = 487517802L;
final String expectedName = "fakeName"; final String expectedName = "fakeName";
@ -188,7 +188,7 @@ public class DDSpanBuilderTest {
assertThat(span.getOperationName()).isEqualTo(expectedName); assertThat(span.getOperationName()).isEqualTo(expectedName);
assertThat(span.getBaggageItem(expectedBaggageItemKey)).isEqualTo(expectedBaggageItemValue); assertThat(span.getBaggageItem(expectedBaggageItemKey)).isEqualTo(expectedBaggageItemValue);
assertThat(((DDSpanContext) span.context()).getServiceName()).isEqualTo(expectedServiceName); assertThat(((DDSpanContext) span.context()).getServiceName()).isEqualTo(expectedServiceName);
assertThat(((DDSpan) span.context()).getResourceName()).isNotEqualTo(expectedResourceName); assertThat(((DDSpanContext) span.context()).getResourceName()).isNotEqualTo(expectedResourceName);
} }