Skip to content

Commit 276f07a

Browse files
committed
feat(gateway): Fix inferred gateway span design
Move propagator to dd-trace-core
1 parent 37ad082 commit 276f07a

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import datadog.trace.api.gateway.CallbackProvider;
2020
import datadog.trace.api.gateway.Flow;
2121
import datadog.trace.api.gateway.IGSpanInfo;
22+
import datadog.trace.api.gateway.InferredProxyHeaders;
2223
import datadog.trace.api.gateway.RequestContext;
2324
import datadog.trace.api.gateway.RequestContextSlot;
24-
import datadog.trace.api.gateway.inferredproxy.InferredProxyHeaders;
2525
import datadog.trace.api.interceptor.MutableSpan;
2626
import datadog.trace.api.naming.SpanNaming;
2727
import datadog.trace.bootstrap.ActiveSubsystems;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import datadog.trace.api.gateway.RequestContext;
4444
import datadog.trace.api.gateway.RequestContextSlot;
4545
import datadog.trace.api.gateway.SubscriptionService;
46-
import datadog.trace.api.gateway.inferredproxy.InferredProxyPropagator;
4746
import datadog.trace.api.interceptor.MutableSpan;
4847
import datadog.trace.api.interceptor.TraceInterceptor;
4948
import datadog.trace.api.internal.TraceSegment;
@@ -90,6 +89,7 @@
9089
import datadog.trace.core.monitor.TracerHealthMetrics;
9190
import datadog.trace.core.propagation.ExtractedContext;
9291
import datadog.trace.core.propagation.HttpCodec;
92+
import datadog.trace.core.propagation.InferredProxyPropagator;
9393
import datadog.trace.core.propagation.PropagationTags;
9494
import datadog.trace.core.propagation.TracingPropagator;
9595
import datadog.trace.core.propagation.XRayPropagator;
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
package datadog.trace.api.gateway.inferredproxy;
1+
package datadog.trace.core.propagation;
22

33
import datadog.context.Context;
44
import datadog.context.propagation.CarrierSetter;
55
import datadog.context.propagation.CarrierVisitor;
66
import datadog.context.propagation.Propagator;
7+
import datadog.trace.api.gateway.InferredProxyHeaders;
78
import java.util.HashMap;
89
import java.util.Map;
910
import java.util.function.BiConsumer;
Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
package datadog.trace.api.gateway.inferredproxy;
1+
package datadog.trace.core.propagation;
22

33
import static datadog.context.Context.root;
4-
import static datadog.trace.api.gateway.inferredproxy.InferredProxyHeaders.fromContext;
4+
import static datadog.trace.api.gateway.InferredProxyHeaders.fromContext;
55
import static org.junit.jupiter.api.Assertions.assertEquals;
66
import static org.junit.jupiter.api.Assertions.assertNotNull;
77
import static org.junit.jupiter.api.Assertions.assertNull;
88

99
import datadog.context.Context;
1010
import datadog.context.propagation.CarrierVisitor;
11+
import datadog.trace.api.gateway.InferredProxyHeaders;
1112
import java.util.HashMap;
1213
import java.util.Map;
1314
import java.util.function.BiConsumer;
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package datadog.trace.api.gateway.inferredproxy;
1+
package datadog.trace.api.gateway;
22

33
import static datadog.context.ContextKey.named;
44

internal-api/src/test/java/datadog/trace/api/gateway/inferredproxy/InferredProxyHeadersTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package datadog.trace.api.gateway.inferredproxy;
22

33
import static datadog.context.Context.root;
4-
import static datadog.trace.api.gateway.inferredproxy.InferredProxyHeaders.fromContext;
5-
import static datadog.trace.api.gateway.inferredproxy.InferredProxyHeaders.fromValues;
4+
import static datadog.trace.api.gateway.InferredProxyHeaders.fromContext;
5+
import static datadog.trace.api.gateway.InferredProxyHeaders.fromValues;
66
import static java.util.Collections.emptyMap;
77
import static org.junit.jupiter.api.Assertions.assertEquals;
88
import static org.junit.jupiter.api.Assertions.assertNotNull;
99
import static org.junit.jupiter.api.Assertions.assertNull;
1010

1111
import datadog.context.Context;
12+
import datadog.trace.api.gateway.InferredProxyHeaders;
1213
import java.util.HashMap;
1314
import java.util.Map;
1415
import org.junit.jupiter.api.DisplayName;

0 commit comments

Comments
 (0)