Skip to content

Commit fbee1b2

Browse files
PerfectSlayerPerfectSlayer
committed
feat(dsm): Refactor DSM API into its own package
1 parent 7af62b2 commit fbee1b2

File tree

66 files changed

+203
-186
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+203
-186
lines changed

‎dd-java-agent/agent-otel/otel-shim/src/main/java/datadog/opentelemetry/shim/trace/OtelExtractedContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import datadog.trace.api.DDSpanId;
44
import datadog.trace.api.DDTraceId;
5+
import datadog.trace.api.datastreams.PathwayContext;
56
import datadog.trace.api.sampling.PrioritySampling;
67
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
78
import datadog.trace.bootstrap.instrumentation.api.AgentTraceCollector;
89
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
9-
import datadog.trace.bootstrap.instrumentation.api.PathwayContext;
1010
import io.opentelemetry.api.trace.Span;
1111
import io.opentelemetry.api.trace.SpanContext;
1212
import io.opentelemetry.context.Context;

‎dd-java-agent/instrumentation/avro/src/main/java/datadog/trace/instrumentation/avro/SchemaExtractor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package datadog.trace.instrumentation.avro;
22

33
import datadog.trace.api.DDTags;
4-
import datadog.trace.bootstrap.instrumentation.api.AgentDataStreamsMonitoring;
4+
import datadog.trace.api.datastreams.AgentDataStreamsMonitoring;
55
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
66
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
77
import datadog.trace.bootstrap.instrumentation.api.Schema;

‎dd-java-agent/instrumentation/aws-java-eventbridge-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/eventbridge/EventBridgeInterceptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99

1010
import datadog.context.propagation.Propagators;
1111
import datadog.trace.api.datastreams.DataStreamsContext;
12+
import datadog.trace.api.datastreams.PathwayContext;
1213
import datadog.trace.bootstrap.InstanceStore;
1314
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
14-
import datadog.trace.bootstrap.instrumentation.api.PathwayContext;
1515
import java.util.ArrayList;
1616
import java.util.LinkedHashMap;
1717
import java.util.List;

‎dd-java-agent/instrumentation/aws-java-sdk-1.11.0/src/main/java/datadog/trace/instrumentation/aws/v0/TracingRequestHandler.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818
import com.amazonaws.handlers.RequestHandler2;
1919
import datadog.context.propagation.Propagators;
2020
import datadog.trace.api.Config;
21+
import datadog.trace.api.datastreams.AgentDataStreamsMonitoring;
22+
import datadog.trace.api.datastreams.PathwayContext;
2123
import datadog.trace.bootstrap.ContextStore;
22-
import datadog.trace.bootstrap.instrumentation.api.AgentDataStreamsMonitoring;
2324
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
2425
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
25-
import datadog.trace.bootstrap.instrumentation.api.PathwayContext;
2626
import java.util.Date;
2727
import java.util.LinkedHashMap;
2828
import java.util.List;

‎dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsSdkClientDecorator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@
1111
import datadog.trace.api.DDTags;
1212
import datadog.trace.api.cache.DDCache;
1313
import datadog.trace.api.cache.DDCaches;
14+
import datadog.trace.api.datastreams.AgentDataStreamsMonitoring;
15+
import datadog.trace.api.datastreams.PathwayContext;
1416
import datadog.trace.api.naming.SpanNaming;
1517
import datadog.trace.bootstrap.InstanceStore;
16-
import datadog.trace.bootstrap.instrumentation.api.AgentDataStreamsMonitoring;
1718
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
1819
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
1920
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
2021
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags;
21-
import datadog.trace.bootstrap.instrumentation.api.PathwayContext;
2222
import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;
2323
import datadog.trace.bootstrap.instrumentation.api.Tags;
2424
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;

‎dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.trace.instrumentation.aws.v1.sqs;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.PathwayContext.DATADOG_KEY;
3+
import static datadog.trace.api.datastreams.PathwayContext.DATADOG_KEY;
44

55
import com.amazonaws.services.sqs.model.MessageAttributeValue;
66
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;

‎dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsInterceptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package datadog.trace.instrumentation.aws.v1.sqs;
22

3+
import static datadog.trace.api.datastreams.PathwayContext.DATADOG_KEY;
34
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.DSM_CONCERN;
45
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan;
5-
import static datadog.trace.bootstrap.instrumentation.api.PathwayContext.DATADOG_KEY;
66
import static datadog.trace.bootstrap.instrumentation.api.URIUtils.urlFileName;
77
import static datadog.trace.core.datastreams.TagsProcessor.DIRECTION_OUT;
88
import static datadog.trace.core.datastreams.TagsProcessor.DIRECTION_TAG;

‎dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageAttributeInjector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package datadog.trace.instrumentation.aws.v2.sqs;
22

3-
import static datadog.trace.bootstrap.instrumentation.api.PathwayContext.DATADOG_KEY;
3+
import static datadog.trace.api.datastreams.PathwayContext.DATADOG_KEY;
44

55
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
66
import java.util.Map;

‎dd-java-agent/instrumentation/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/SqsInterceptor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package datadog.trace.instrumentation.aws.v2.sqs;
22

3+
import static datadog.trace.api.datastreams.PathwayContext.DATADOG_KEY;
34
import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.DSM_CONCERN;
4-
import static datadog.trace.bootstrap.instrumentation.api.PathwayContext.DATADOG_KEY;
55
import static datadog.trace.bootstrap.instrumentation.api.URIUtils.urlFileName;
66
import static datadog.trace.core.datastreams.TagsProcessor.DIRECTION_OUT;
77
import static datadog.trace.core.datastreams.TagsProcessor.DIRECTION_TAG;

‎dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/AvroSchemaExtractor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package datadog.trace.instrumentation.kafka_clients;
22

33
import datadog.trace.api.DDTags;
4-
import datadog.trace.bootstrap.instrumentation.api.AgentDataStreamsMonitoring;
4+
import datadog.trace.api.datastreams.AgentDataStreamsMonitoring;
55
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
66
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
77
import datadog.trace.util.FNV64Hash;

‎dd-java-agent/instrumentation/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaProducerInstrumentation.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
import datadog.trace.agent.tooling.InstrumenterModule;
3131
import datadog.trace.api.Config;
3232
import datadog.trace.api.datastreams.DataStreamsContext;
33+
import datadog.trace.api.datastreams.StatsPoint;
3334
import datadog.trace.bootstrap.InstrumentationContext;
3435
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
3536
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
3637
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
3738
import datadog.trace.bootstrap.instrumentation.api.InstrumentationTags;
38-
import datadog.trace.bootstrap.instrumentation.api.StatsPoint;
3939
import java.util.LinkedHashMap;
4040
import java.util.Map;
4141
import net.bytebuddy.asm.Advice;

‎dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/AvroSchemaExtractor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package datadog.trace.instrumentation.kafka_clients38;
22

33
import datadog.trace.api.DDTags;
4-
import datadog.trace.bootstrap.instrumentation.api.AgentDataStreamsMonitoring;
4+
import datadog.trace.api.datastreams.AgentDataStreamsMonitoring;
55
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
66
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
77
import datadog.trace.util.FNV64Hash;

‎dd-java-agent/instrumentation/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/PayloadSizeAdvice.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan;
44

5+
import datadog.trace.api.datastreams.StatsPoint;
56
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
6-
import datadog.trace.bootstrap.instrumentation.api.StatsPoint;
77
import net.bytebuddy.asm.Advice;
88

99
public class PayloadSizeAdvice {

‎dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/test/groovy/TypeConverterTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import datadog.trace.api.sampling.PrioritySampling
55
import datadog.trace.bootstrap.instrumentation.api.AgentScope
66
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext
77
import datadog.trace.bootstrap.instrumentation.api.AgentTracer
8-
import datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopPathwayContext
8+
import datadog.trace.api.datastreams.NoopPathwayContext
99
import datadog.trace.bootstrap.instrumentation.api.ScopeSource
1010
import datadog.trace.core.DDSpan
1111
import datadog.trace.core.DDSpanContext

‎dd-java-agent/instrumentation/opentracing/api-0.31/src/test/groovy/TypeConverterTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import datadog.trace.api.sampling.PrioritySampling
55
import datadog.trace.bootstrap.instrumentation.api.AgentScope
66
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext
77
import datadog.trace.bootstrap.instrumentation.api.AgentTracer
8-
import datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopPathwayContext
8+
import datadog.trace.api.datastreams.NoopPathwayContext
99
import datadog.trace.bootstrap.instrumentation.api.ScopeSource
1010
import datadog.trace.core.DDSpan
1111
import datadog.trace.core.DDSpanContext

‎dd-java-agent/instrumentation/opentracing/api-0.32/src/test/groovy/TypeConverterTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import datadog.trace.api.sampling.PrioritySampling
55
import datadog.trace.bootstrap.instrumentation.api.AgentScope
66
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext
77
import datadog.trace.bootstrap.instrumentation.api.AgentTracer
8-
import datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopPathwayContext
8+
import datadog.trace.api.datastreams.NoopPathwayContext
99
import datadog.trace.bootstrap.instrumentation.api.ScopeSource
1010
import datadog.trace.core.DDSpan
1111
import datadog.trace.core.DDSpanContext

‎dd-java-agent/instrumentation/protobuf/src/main/java/datadog/trace/instrumentation/protobuf_java/SchemaExtractor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.google.protobuf.Descriptors.Descriptor;
55
import com.google.protobuf.Descriptors.FieldDescriptor;
66
import datadog.trace.api.DDTags;
7-
import datadog.trace.bootstrap.instrumentation.api.AgentDataStreamsMonitoring;
7+
import datadog.trace.api.datastreams.AgentDataStreamsMonitoring;
88
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
99
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
1010
import datadog.trace.bootstrap.instrumentation.api.Schema;

‎dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/DatabricksParentContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import datadog.trace.api.DDSpanId;
44
import datadog.trace.api.DDTraceId;
5+
import datadog.trace.api.datastreams.PathwayContext;
56
import datadog.trace.api.sampling.PrioritySampling;
67
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
78
import datadog.trace.bootstrap.instrumentation.api.AgentTraceCollector;
8-
import datadog.trace.bootstrap.instrumentation.api.PathwayContext;
99
import java.nio.ByteBuffer;
1010
import java.nio.charset.StandardCharsets;
1111
import java.security.MessageDigest;

‎dd-java-agent/instrumentation/spark/src/main/java/datadog/trace/instrumentation/spark/OpenlineageParentContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import datadog.trace.api.DDSpanId;
44
import datadog.trace.api.DDTraceId;
5+
import datadog.trace.api.datastreams.PathwayContext;
56
import datadog.trace.api.sampling.PrioritySampling;
67
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
78
import datadog.trace.bootstrap.instrumentation.api.AgentTraceCollector;
89
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
9-
import datadog.trace.bootstrap.instrumentation.api.PathwayContext;
1010
import java.nio.ByteBuffer;
1111
import java.nio.charset.StandardCharsets;
1212
import java.security.MessageDigest;

‎dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/AgentTestRunner.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import datadog.trace.api.time.SystemTimeSource
2828
import datadog.trace.bootstrap.ActiveSubsystems
2929
import datadog.trace.bootstrap.CallDepthThreadLocalMap
3030
import datadog.trace.bootstrap.InstrumentationErrors
31-
import datadog.trace.bootstrap.instrumentation.api.AgentDataStreamsMonitoring
31+
import datadog.trace.api.datastreams.AgentDataStreamsMonitoring
3232
import datadog.trace.bootstrap.instrumentation.api.AgentSpan
3333
import datadog.trace.bootstrap.instrumentation.api.AgentTracer.TracerAPI
3434
import datadog.trace.common.metrics.EventListener

‎dd-trace-core/src/jmh/java/datadog/trace/common/writer/ddagent/TraceMapperBenchmark.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import datadog.communication.serialization.msgpack.MsgPackWriter;
1313
import datadog.trace.api.DDSpanId;
1414
import datadog.trace.api.DDTraceId;
15+
import datadog.trace.api.datastreams.NoopPathwayContext;
1516
import datadog.trace.api.sampling.PrioritySampling;
16-
import datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopPathwayContext;
1717
import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString;
1818
import datadog.trace.core.CoreTracer;
1919
import datadog.trace.core.DDSpan;

‎dd-trace-core/src/jmh/java/datadog/trace/core/PendingTraceWrite.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import datadog.trace.api.DDSpanId;
44
import datadog.trace.api.DDTraceId;
5+
import datadog.trace.api.datastreams.NoopPathwayContext;
56
import datadog.trace.api.sampling.PrioritySampling;
6-
import datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopPathwayContext;
77
import java.util.Collections;
88
import org.openjdk.jmh.annotations.Benchmark;
99
import org.openjdk.jmh.annotations.Level;

‎dd-trace-core/src/jmh/java/datadog/trace/core/TracerMapperMap.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import datadog.communication.serialization.msgpack.MsgPackWriter;
44
import datadog.trace.api.DDSpanId;
55
import datadog.trace.api.DDTraceId;
6+
import datadog.trace.api.datastreams.NoopPathwayContext;
67
import datadog.trace.api.sampling.PrioritySampling;
7-
import datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopPathwayContext;
88
import datadog.trace.common.writer.LoggingWriter;
99
import datadog.trace.common.writer.ddagent.TraceMapperV0_4;
1010
import datadog.trace.common.writer.ddagent.TraceMapperV0_5;

‎dd-trace-core/src/main/java/datadog/trace/core/CoreTracer.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434
import datadog.trace.api.StatsDClient;
3535
import datadog.trace.api.TraceConfig;
3636
import datadog.trace.api.config.GeneralConfig;
37+
import datadog.trace.api.datastreams.AgentDataStreamsMonitoring;
38+
import datadog.trace.api.datastreams.PathwayContext;
3739
import datadog.trace.api.experimental.DataStreamsCheckpointer;
3840
import datadog.trace.api.flare.TracerFlare;
3941
import datadog.trace.api.gateway.CallbackProvider;
@@ -51,7 +53,6 @@
5153
import datadog.trace.api.scopemanager.ScopeListener;
5254
import datadog.trace.api.time.SystemTimeSource;
5355
import datadog.trace.api.time.TimeSource;
54-
import datadog.trace.bootstrap.instrumentation.api.AgentDataStreamsMonitoring;
5556
import datadog.trace.bootstrap.instrumentation.api.AgentHistogram;
5657
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
5758
import datadog.trace.bootstrap.instrumentation.api.AgentScope;
@@ -60,7 +61,6 @@
6061
import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink;
6162
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
6263
import datadog.trace.bootstrap.instrumentation.api.BlackHoleSpan;
63-
import datadog.trace.bootstrap.instrumentation.api.PathwayContext;
6464
import datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration;
6565
import datadog.trace.bootstrap.instrumentation.api.ScopeSource;
6666
import datadog.trace.bootstrap.instrumentation.api.ScopeState;

‎dd-trace-core/src/main/java/datadog/trace/core/DDSpanContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import datadog.trace.api.cache.DDCache;
1111
import datadog.trace.api.cache.DDCaches;
1212
import datadog.trace.api.config.TracerConfig;
13+
import datadog.trace.api.datastreams.PathwayContext;
1314
import datadog.trace.api.gateway.BlockResponseFunction;
1415
import datadog.trace.api.gateway.RequestContext;
1516
import datadog.trace.api.gateway.RequestContextSlot;
@@ -18,7 +19,6 @@
1819
import datadog.trace.api.sampling.SamplingMechanism;
1920
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
2021
import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink;
21-
import datadog.trace.bootstrap.instrumentation.api.PathwayContext;
2222
import datadog.trace.bootstrap.instrumentation.api.ProfilerContext;
2323
import datadog.trace.bootstrap.instrumentation.api.ProfilingContextIntegration;
2424
import datadog.trace.bootstrap.instrumentation.api.ResourceNamePriorities;

‎dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamContextInjector.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package datadog.trace.core.datastreams;
22

33
import static datadog.trace.api.DDTags.PATHWAY_HASH;
4-
import static datadog.trace.bootstrap.instrumentation.api.PathwayContext.PROPAGATION_KEY_BASE64;
4+
import static datadog.trace.api.datastreams.PathwayContext.PROPAGATION_KEY_BASE64;
55

6+
import datadog.trace.api.datastreams.PathwayContext;
67
import datadog.trace.bootstrap.instrumentation.api.AgentPropagation;
78
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
8-
import datadog.trace.bootstrap.instrumentation.api.PathwayContext;
99
import java.io.IOException;
1010
import java.util.LinkedHashMap;
1111
import org.slf4j.Logger;

‎dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsMonitoring.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package datadog.trace.core.datastreams;
22

33
import datadog.context.propagation.Propagator;
4+
import datadog.trace.api.datastreams.AgentDataStreamsMonitoring;
5+
import datadog.trace.api.datastreams.PathwayContext;
46
import datadog.trace.api.experimental.DataStreamsContextCarrier;
5-
import datadog.trace.bootstrap.instrumentation.api.AgentDataStreamsMonitoring;
67
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
78
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
8-
import datadog.trace.bootstrap.instrumentation.api.PathwayContext;
99
import datadog.trace.core.propagation.HttpCodec;
1010

1111
public interface DataStreamsMonitoring extends AgentDataStreamsMonitoring, AutoCloseable {

‎dd-trace-core/src/main/java/datadog/trace/core/datastreams/DataStreamsPropagator.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package datadog.trace.core.datastreams;
22

33
import static datadog.trace.api.DDTags.PATHWAY_HASH;
4-
import static datadog.trace.bootstrap.instrumentation.api.PathwayContext.PROPAGATION_KEY_BASE64;
4+
import static datadog.trace.api.datastreams.PathwayContext.PROPAGATION_KEY_BASE64;
55

66
import datadog.context.Context;
77
import datadog.context.propagation.CarrierSetter;
88
import datadog.context.propagation.CarrierVisitor;
99
import datadog.context.propagation.Propagator;
1010
import datadog.trace.api.TraceConfig;
1111
import datadog.trace.api.datastreams.DataStreamsContext;
12+
import datadog.trace.api.datastreams.PathwayContext;
1213
import datadog.trace.api.time.TimeSource;
1314
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
1415
import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext;
15-
import datadog.trace.bootstrap.instrumentation.api.PathwayContext;
1616
import datadog.trace.bootstrap.instrumentation.api.TagContext;
1717
import java.io.IOException;
1818
import java.util.function.Supplier;

‎dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultDataStreamsMonitoring.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@
1818
import datadog.trace.api.Config;
1919
import datadog.trace.api.TraceConfig;
2020
import datadog.trace.api.WellKnownTags;
21+
import datadog.trace.api.datastreams.Backlog;
22+
import datadog.trace.api.datastreams.InboxItem;
23+
import datadog.trace.api.datastreams.NoopPathwayContext;
24+
import datadog.trace.api.datastreams.PathwayContext;
25+
import datadog.trace.api.datastreams.StatsPoint;
2126
import datadog.trace.api.experimental.DataStreamsContextCarrier;
2227
import datadog.trace.api.time.TimeSource;
2328
import datadog.trace.bootstrap.instrumentation.api.AgentSpan;
24-
import datadog.trace.bootstrap.instrumentation.api.AgentTracer;
25-
import datadog.trace.bootstrap.instrumentation.api.Backlog;
26-
import datadog.trace.bootstrap.instrumentation.api.InboxItem;
27-
import datadog.trace.bootstrap.instrumentation.api.PathwayContext;
2829
import datadog.trace.bootstrap.instrumentation.api.Schema;
2930
import datadog.trace.bootstrap.instrumentation.api.SchemaIterator;
30-
import datadog.trace.bootstrap.instrumentation.api.StatsPoint;
3131
import datadog.trace.common.metrics.EventListener;
3232
import datadog.trace.common.metrics.OkHttpSink;
3333
import datadog.trace.common.metrics.Sink;
@@ -197,7 +197,7 @@ public PathwayContext newPathwayContext() {
197197
if (configSupportsDataStreams) {
198198
return new DefaultPathwayContext(timeSource, hashOfKnownTags, getThreadServiceName());
199199
} else {
200-
return AgentTracer.NoopPathwayContext.INSTANCE;
200+
return NoopPathwayContext.INSTANCE;
201201
}
202202
}
203203

‎dd-trace-core/src/main/java/datadog/trace/core/datastreams/DefaultPathwayContext.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
import datadog.context.propagation.CarrierVisitor;
1111
import datadog.trace.api.Config;
1212
import datadog.trace.api.WellKnownTags;
13+
import datadog.trace.api.datastreams.PathwayContext;
14+
import datadog.trace.api.datastreams.StatsPoint;
1315
import datadog.trace.api.time.TimeSource;
14-
import datadog.trace.bootstrap.instrumentation.api.PathwayContext;
15-
import datadog.trace.bootstrap.instrumentation.api.StatsPoint;
1616
import datadog.trace.util.FNV64Hash;
1717
import java.io.IOException;
1818
import java.util.ArrayList;

‎dd-trace-core/src/main/java/datadog/trace/core/datastreams/StatsBucket.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package datadog.trace.core.datastreams;
22

3-
import datadog.trace.bootstrap.instrumentation.api.Backlog;
4-
import datadog.trace.bootstrap.instrumentation.api.StatsPoint;
3+
import datadog.trace.api.datastreams.Backlog;
4+
import datadog.trace.api.datastreams.StatsPoint;
55
import java.util.Collection;
66
import java.util.HashMap;
77
import java.util.List;

‎dd-trace-core/src/test/groovy/datadog/trace/common/writer/DDAgentWriterCombinedTest.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import datadog.trace.api.DDSpanId
44
import datadog.trace.api.DDTraceId
55
import datadog.trace.api.StatsDClient
66
import datadog.trace.api.sampling.PrioritySampling
7-
import datadog.trace.bootstrap.instrumentation.api.AgentTracer.NoopPathwayContext
7+
import datadog.trace.api.datastreams.NoopPathwayContext
88
import datadog.trace.common.writer.ddagent.DDAgentApi
99
import datadog.communication.ddagent.DDAgentFeaturesDiscovery
1010
import datadog.trace.common.writer.ddagent.TraceMapperV0_4

0 commit comments

Comments
 (0)