Skip to content

Commit b6d7fbc

Browse files
PerfectSlayerPerfectSlayer
committed
feat(dsm): Refactor DSM API into its own package
1 parent 418083b commit b6d7fbc

File tree

66 files changed

+203
-183
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
-183
lines changed

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

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import static datadog.trace.instrumentation.aws.v2.eventbridge.TextMapInjectAdapter.SETTER;
1010

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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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;

0 commit comments

Comments
 (0)