feat(aws): Refactor AWS instrumentation around Context

Author: PerfectSlayer

dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsClientInstrumentation.java

@@ -46,8 +46,7 @@ public String[] helperClassNames() {
   @Override
   public Map<String, String> contextStore() {
     return Collections.singletonMap(
-        "com.amazonaws.AmazonWebServiceRequest",
-        "datadog.trace.bootstrap.instrumentation.api.AgentSpan");
+        "com.amazonaws.AmazonWebServiceRequest", "datadog.context.Context");
   }
 
   public static class HandlerChainAdvice {
@@ -62,8 +61,7 @@ public static void addHandler(@Advice.Return final List<RequestHandler2> handler
         handlers.add(
             new SqsInterceptor(
                 InstrumentationContext.get(
-                    "com.amazonaws.AmazonWebServiceRequest",
-                    "datadog.trace.bootstrap.instrumentation.api.AgentSpan")));
+                    "com.amazonaws.AmazonWebServiceRequest", "datadog.context.Context")));
       }
     }
   }

dd-java-agent/instrumentation/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/SqsInterceptor.java

@@ -29,9 +29,9 @@
 
 public class SqsInterceptor extends RequestHandler2 {
 
-  private final ContextStore<AmazonWebServiceRequest, AgentSpan> contextStore;
+  private final ContextStore<AmazonWebServiceRequest, Context> contextStore;
 
-  public SqsInterceptor(ContextStore<AmazonWebServiceRequest, AgentSpan> contextStore) {
+  public SqsInterceptor(ContextStore<AmazonWebServiceRequest, Context> contextStore) {
     this.contextStore = contextStore;
   }
 
@@ -89,6 +89,7 @@ private AgentSpan newSpan(AmazonWebServiceRequest request) {
     final AgentSpan span = startSpan("sqs", "aws.sqs.send");
     // pass the span to TracingRequestHandler in the sdk instrumentation where it'll be enriched &
     // activated
+    // TODO If DSM is enabled, add DSM context here too
     contextStore.put(request, span);
     return span;
   }