Skip to content

Commit 8b0a96d

Browse files
committed
Define earlier
1 parent 4b03ecb commit 8b0a96d

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

  • dd-java-agent/instrumentation/vertx/vertx-web

dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-3.4/src/main/java/datadog/trace/instrumentation/vertx_3_4/server/RouteHandlerWrapper.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ public void handle(final RoutingContext routingContext) {
4242
if (spanStarter) {
4343
if (span == null) {
4444
AgentSpan parentSpan = activeSpan();
45+
if (parentSpan != null) {
46+
parentSpan = parentSpan.getLocalRootSpan();
47+
}
4548
routingContext.put(PARENT_SPAN_CONTEXT_KEY, parentSpan);
4649

4750
span = startSpan(INSTRUMENTATION_NAME);
@@ -69,7 +72,7 @@ private void setRoute(RoutingContext routingContext) {
6972
return;
7073
}
7174

72-
final AgentSpan routeSpan = parentSpan.getLocalRootSpan();
75+
final AgentSpan routeSpan = parentSpan;
7376

7477
final String method = routingContext.request().rawMethod();
7578
String mountPoint = routingContext.mountPoint();

dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/server/RouteHandlerWrapper.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ public void handle(final RoutingContext routingContext) {
3838
if (spanStarter) {
3939
if (span == null) {
4040
AgentSpan parentSpan = activeSpan();
41+
if (parentSpan != null) {
42+
parentSpan = parentSpan.getLocalRootSpan();
43+
}
4144
routingContext.put(PARENT_SPAN_CONTEXT_KEY, parentSpan);
4245

4346
span = startSpan(INSTRUMENTATION_NAME);
@@ -66,7 +69,7 @@ private void setRoute(RoutingContext routingContext) {
6669
return;
6770
}
6871

69-
final AgentSpan routeSpan = parentSpan.getLocalRootSpan();
72+
final AgentSpan routeSpan = parentSpan;
7073

7174
final String method = routingContext.request().method().name();
7275
final String mountPoint = routingContext.mountPoint();

0 commit comments

Comments
 (0)