Consistency: rename AgentScope.Continuation.getSpan() to AgentScope.Continuation.span()

Author: mcculls

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/ContinuationClaim.java

@@ -18,7 +18,7 @@ public AgentScope activate() {
   }
 
   @Override
-  public AgentSpan getSpan() {
+  public AgentSpan span() {
     throw new IllegalStateException();
   }
 

dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/State.java

@@ -60,7 +60,7 @@ public void closeContinuation() {
   public AgentSpan getSpan() {
     AgentScope.Continuation continuation = CONTINUATION.get(this);
     if (null != continuation) {
-      return continuation.getSpan();
+      return continuation.span();
     }
     return null;
   }

dd-java-agent/instrumentation/undertow/src/main/java/datadog/trace/instrumentation/undertow/UndertowBlockingHandler.java

@@ -119,7 +119,7 @@ private static void commitBlockingResponse(
   private static void markAsEffectivelyBlocked(HttpServerExchange xchg) {
     AgentScope.Continuation continuation = xchg.getAttachment(DD_UNDERTOW_CONTINUATION);
     if (continuation != null) {
-      continuation.getSpan().getRequestContext().getTraceSegment().effectivelyBlocked();
+      continuation.span().getRequestContext().getTraceSegment().effectivelyBlocked();
     }
   }
 }

dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/ExchangeEndSpanListener.java

@@ -21,7 +21,7 @@ public void exchangeEvent(HttpServerExchange exchange, NextListener nextListener
       return;
     }
 
-    AgentSpan span = continuation.getSpan();
+    AgentSpan span = continuation.span();
 
     Throwable throwable = exchange.getAttachment(DefaultResponseListener.EXCEPTION);
     if (throwable != null) {

dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeSenderInstrumentation.java

@@ -69,7 +69,7 @@ static class GetResponseChannelAdvice {
       }
       xchg.putAttachment(IgnoreSendAttribute.IGNORE_SEND_KEY, IgnoreSendAttribute.INSTANCE);
 
-      AgentSpan span = continuation.getSpan();
+      AgentSpan span = continuation.span();
       Flow<Void> flow =
           UndertowDecorator.DECORATE.callIGCallbackResponseAndHeaders(
               span, xchg, xchg.getStatusCode(), UndertowExtractAdapter.Response.GETTER);

dd-java-agent/instrumentation/undertow/undertow-2.0/src/main/java/datadog/trace/instrumentation/undertow/ServletInstrumentation.java

@@ -66,7 +66,7 @@ public static void enter(
         @Advice.Argument(1) final ServletRequestContext servletRequestContext) {
       AgentScope.Continuation continuation = exchange.getAttachment(DD_UNDERTOW_CONTINUATION);
       if (continuation != null) {
-        AgentSpan undertowSpan = continuation.getSpan();
+        AgentSpan undertowSpan = continuation.span();
         ServletRequest request = servletRequestContext.getServletRequest();
         request.setAttribute(DD_SPAN_ATTRIBUTE, undertowSpan);
         undertowSpan.setSpanName(SERVLET_REQUEST);

dd-java-agent/instrumentation/undertow/undertow-2.2/src/main/java/datadog/trace/instrumentation/undertow/JakartaServletInstrumentation.java

@@ -58,7 +58,7 @@ public static void enter(
         @Advice.Argument(1) final ServletRequestContext servletRequestContext) {
       AgentScope.Continuation continuation = exchange.getAttachment(DD_UNDERTOW_CONTINUATION);
       if (continuation != null) {
-        AgentSpan undertowSpan = continuation.getSpan();
+        AgentSpan undertowSpan = continuation.span();
         ServletRequest request = servletRequestContext.getServletRequest();
         request.setAttribute(DD_SPAN_ATTRIBUTE, undertowSpan);
         undertowSpan.setSpanName(SERVLET_REQUEST);

dd-trace-core/src/main/java/datadog/trace/core/scopemanager/ScopeContinuation.java

@@ -113,7 +113,7 @@ void cancelFromContinuedScopeClose() {
   }
 
   @Override
-  public AgentSpan getSpan() {
+  public AgentSpan span() {
     return spanUnderScope;
   }
 

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentScope.java

@@ -22,6 +22,6 @@ interface Continuation extends TraceScope.Continuation {
     AgentScope activate();
 
     /** Provide access to the captured span */
-    AgentSpan getSpan();
+    AgentSpan span();
   }
 }

internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopContinuation.java

@@ -16,7 +16,7 @@ public AgentScope activate() {
   }
 
   @Override
-  public AgentSpan getSpan() {
+  public AgentSpan span() {
     return NoopSpan.INSTANCE;
   }