Skip to content

Commit 934f400

Browse files
committed
add draft inferred proxy spans as http request parent
1 parent c527f13 commit 934f400

File tree

10 files changed

+800
-3
lines changed

10 files changed

+800
-3
lines changed

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

Lines changed: 383 additions & 2 deletions
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
diff a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/HttpServerDecorator.java (rejected hunks)
2+
@@ -150,7 +523,7 @@ public abstract class HttpServerDecorator<REQUEST, CONNECTION, RESPONSE, REQUEST
3+
if (null != carrier && null != getter) {
4+
tracer().getDataStreamsMonitoring().setCheckpoint(span, SERVER_PATHWAY_EDGE_TAGS, 0, 0);
5+
}
6+
- return span;
7+
+ return new MySpan(apiGtwSpan, span);
8+
}
9+
10+
public AgentSpan onRequest(

dd-trace-api/src/main/java/datadog/trace/api/TracePropagationStyle.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ public enum TracePropagationStyle {
1818
// Amazon X-Ray context propagation style
1919
// https://docs.aws.amazon.com/xray/latest/devguide/xray-concepts.html#xray-concepts-tracingheader
2020
XRAY,
21+
// TODO: add INFERREDPROXY style here,
22+
// may NOT make full sense to add, because they are meeant to be for
2123
// W3C trace context propagation style
2224
// https://www.w3.org/TR/trace-context-1/
2325
TRACECONTEXT,

dd-trace-core/src/main/java/datadog/trace/core/propagation/HttpCodec.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ public static Extractor createExtractor(
159159
case TRACECONTEXT:
160160
extractors.add(W3CHttpCodec.newExtractor(config, traceConfigSupplier));
161161
break;
162+
// TODO: make case INFERREDPROXYSPAN
162163
default:
163164
log.debug("No implementation found to extract propagation style: {}", style);
164165
break;

0 commit comments

Comments
 (0)