From 5cbc11415d57cf106c926576eb13418d8313ae70 Mon Sep 17 00:00:00 2001 From: Tyler Benson Date: Wed, 28 Feb 2018 12:22:39 +1000 Subject: [PATCH] Move SpanFactory to correct package. --- .../{trace => opentracing}/SpanFactory.groovy | 30 ++++++++++++++----- .../decorators/SpanDecoratorTest.groovy | 2 +- .../datadog/trace/DDSpanContextTest.groovy | 1 + .../sampling/RateByServiceSamplerTest.groovy | 2 +- .../trace/api/writer/DDAgentWriterTest.groovy | 2 +- .../datadog/trace/api/writer/DDApiTest.groovy | 2 +- 6 files changed, 27 insertions(+), 12 deletions(-) rename dd-trace-ot/src/test/groovy/datadog/{trace => opentracing}/SpanFactory.groovy (72%) diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/SpanFactory.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/SpanFactory.groovy similarity index 72% rename from dd-trace-ot/src/test/groovy/datadog/trace/SpanFactory.groovy rename to dd-trace-ot/src/test/groovy/datadog/opentracing/SpanFactory.groovy index a624331a84..70a8d93f1c 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/SpanFactory.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/SpanFactory.groovy @@ -1,9 +1,5 @@ -package datadog.trace +package datadog.opentracing -import datadog.opentracing.DDSpan -import datadog.opentracing.DDSpanContext -import datadog.opentracing.DDTracer -import datadog.opentracing.TraceCollection import datadog.trace.common.sampling.PrioritySampling import datadog.trace.common.writer.ListWriter @@ -23,7 +19,7 @@ class SpanFactory { false, "fakeType", Collections.emptyMap(), - new TraceCollection(tracer), + new TraceCollection(tracer, 1L), tracer) return new DDSpan(timestampMicro, context) } @@ -41,11 +37,29 @@ class SpanFactory { false, "fakeType", Collections.emptyMap(), - new TraceCollection(tracer), + new TraceCollection(tracer, 1L), tracer) return new DDSpan(1, context) } + static newSpanOf(TraceCollection trace) { + def context = new DDSpanContext( + trace.traceId, + 1L, + 0L, + "fakeService", + "fakeOperation", + "fakeResource", + PrioritySampling.UNSET, + Collections.emptyMap(), + false, + "fakeType", + Collections.emptyMap(), + trace, + trace.tracer) + return new DDSpan(1, context) + } + static DDSpan newSpanOf(String serviceName, String envName) { def writer = new ListWriter() def tracer = new DDTracer(writer) @@ -61,7 +75,7 @@ class SpanFactory { false, "fakeType", Collections.emptyMap(), - new TraceCollection(tracer), + new TraceCollection(tracer, 1L), tracer) context.setTag("env", envName) return new DDSpan(0l, context) diff --git a/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy index 7469ebd584..ef08682f45 100644 --- a/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/opentracing/decorators/SpanDecoratorTest.groovy @@ -2,7 +2,7 @@ package datadog.opentracing.decorators import datadog.opentracing.DDSpanContext import datadog.opentracing.DDTracer -import datadog.trace.SpanFactory +import datadog.opentracing.SpanFactory import datadog.trace.common.writer.LoggingWriter import io.opentracing.tag.StringTag import io.opentracing.tag.Tags diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy index 8db8fcd393..cb7e1cb779 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/DDSpanContextTest.groovy @@ -1,5 +1,6 @@ package datadog.trace +import datadog.opentracing.SpanFactory import datadog.trace.api.DDTags import spock.lang.Specification import spock.lang.Timeout diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/api/sampling/RateByServiceSamplerTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/api/sampling/RateByServiceSamplerTest.groovy index 8f399a0996..93afde9859 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/api/sampling/RateByServiceSamplerTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/api/sampling/RateByServiceSamplerTest.groovy @@ -2,7 +2,7 @@ package datadog.trace.api.sampling import com.fasterxml.jackson.databind.ObjectMapper import datadog.opentracing.DDSpan -import datadog.trace.SpanFactory +import datadog.opentracing.SpanFactory import datadog.trace.common.sampling.PrioritySampling import datadog.trace.common.sampling.RateByServiceSampler import spock.lang.Specification diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy index 8119f40825..72679c681d 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDAgentWriterTest.groovy @@ -7,7 +7,7 @@ import datadog.trace.common.writer.WriterQueue import spock.lang.Specification import spock.lang.Timeout -import static datadog.trace.SpanFactory.newSpanOf +import static datadog.opentracing.SpanFactory.newSpanOf import static org.mockito.Mockito.mock import static org.mockito.Mockito.verifyNoMoreInteractions diff --git a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy index 19cae1be62..a548d5988e 100644 --- a/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy +++ b/dd-trace-ot/src/test/groovy/datadog/trace/api/writer/DDApiTest.groovy @@ -3,7 +3,7 @@ package datadog.trace.api.writer import com.fasterxml.jackson.core.type.TypeReference import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.ObjectMapper -import datadog.trace.SpanFactory +import datadog.opentracing.SpanFactory import datadog.trace.common.Service import datadog.trace.common.writer.DDApi import datadog.trace.common.writer.DDApi.ResponseListener