From 0e7418fde6035038b11f46cad15db3ce87f2ab98 Mon Sep 17 00:00:00 2001
From: Nikolay Martynov <mar.kolya@gmail.com>
Date: Thu, 4 Apr 2019 15:49:35 -0400
Subject: [PATCH] AWS v2: use scope when span is created

---
 .../instrumentation/aws/v2/TracingExecutionInterceptor.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java8/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java b/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java8/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java
index 4ad249fb07..224e93bfa8 100644
--- a/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java8/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java
+++ b/dd-java-agent/instrumentation/aws-java-sdk-2.2/src/main/java8/datadog/trace/instrumentation/aws/v2/TracingExecutionInterceptor.java
@@ -34,8 +34,10 @@ public class TracingExecutionInterceptor implements ExecutionInterceptor {
   public void beforeExecution(
       final Context.BeforeExecution context, final ExecutionAttributes executionAttributes) {
     final Span span = GlobalTracer.get().buildSpan("aws.command").start();
-    DECORATE.afterStart(span);
-    executionAttributes.putAttribute(SPAN_ATTRIBUTE, span);
+    try (final Scope scope = GlobalTracer.get().scopeManager().activate(span, false)) {
+      DECORATE.afterStart(span);
+      executionAttributes.putAttribute(SPAN_ATTRIBUTE, span);
+    }
   }
 
   @Override