fixing ambiguous overloading tests

Author: mhlidd

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

@@ -143,7 +143,7 @@ public Context extractContext(REQUEST_CARRIER carrier) {
     return Propagators.defaultPropagator().extract(Context.root(), carrier, getter);
   }
 
-  /** Deprecated. Use {@link #startSpan(String, Object, Context)} instead. */
+  /** Deprecated. Use {@link #startSpanFromContext(String, Object, Context)} instead. */
   @Deprecated
   public AgentSpan startSpan(REQUEST_CARRIER carrier, AgentSpanContext.Extracted context) {
     return startSpan("http-server", carrier, context);
@@ -166,7 +166,8 @@ public AgentSpan startSpan(
     return span;
   }
 
-  public AgentSpan startSpan(String instrumentationName, REQUEST_CARRIER carrier, Context context) {
+  public AgentSpan startSpanFromContext(
+      String instrumentationName, REQUEST_CARRIER carrier, Context context) {
     return startSpan(instrumentationName, carrier, getExtractedSpanContext(context));
   }
 

dd-java-agent/instrumentation/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/TomcatServerInstrumentation.java

@@ -129,7 +129,7 @@ public static ContextScope onService(@Advice.Argument(0) org.apache.coyote.Reque
       req.setAttribute(
           DD_EXTRACTED_CONTEXT_ATTRIBUTE, DECORATE.getExtractedSpanContext(extractedContext));
 
-      final AgentSpan span = DECORATE.startSpan("http-server", req, extractedContext);
+      final AgentSpan span = DECORATE.startSpanFromContext("http-server", req, extractedContext);
       final ContextScope scope = extractedContext.with(span).attach();
       // This span is finished when Request.recycle() is called by RequestInstrumentation.
       DECORATE.afterStart(span);