simplify

Author: trask

instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/AbstractSpringBootBasedTest.java

@@ -9,7 +9,6 @@
 import static io.opentelemetry.instrumentation.testing.junit.code.SemconvCodeStabilityUtil.codeFunctionSuffixAssertions;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.AUTH_ERROR;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.CAPTURE_HEADERS;
-import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.DEFERRED_RESULT;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.EXCEPTION;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.INDEXED_CHILD;
 import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.LOGIN;
@@ -53,6 +52,9 @@
 public abstract class AbstractSpringBootBasedTest
     extends AbstractHttpServerTest<ConfigurableApplicationContext> {
 
+  static final ServerEndpoint DEFERRED_RESULT =
+      new ServerEndpoint("DEFERRED_RESULT", "deferred-result", 200, "deferred result");
+
   private static final String EXPERIMENTAL_SPAN_CONFIG =
       "otel.instrumentation.spring-webmvc.experimental-span-attributes";
 

instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestBean.java

@@ -5,7 +5,7 @@
 
 package io.opentelemetry.instrumentation.spring.webmvc.boot;
 
-import static io.opentelemetry.instrumentation.testing.junit.http.ServerEndpoint.DEFERRED_RESULT;
+import static io.opentelemetry.instrumentation.spring.webmvc.boot.AbstractSpringBootBasedTest.DEFERRED_RESULT;
 
 import io.opentelemetry.api.GlobalOpenTelemetry;
 import io.opentelemetry.api.trace.Span;
@@ -21,7 +21,7 @@ public class TestBean {
   private static final Tracer tracer = GlobalOpenTelemetry.getTracer("test");
 
   @Async
-  public void asyncDependencyCall(DeferredResult<String> deferredResult) {
+  public void asyncCall(DeferredResult<String> deferredResult) {
     Span span = tracer.spanBuilder("deferred-result-child").startSpan();
     try (Scope ignored = span.makeCurrent()) {
       deferredResult.setResult(DEFERRED_RESULT.getBody());

instrumentation/spring/spring-webmvc/spring-webmvc-common/testing/src/main/java/io/opentelemetry/instrumentation/spring/webmvc/boot/TestController.java

@@ -108,7 +108,7 @@ String indexedChild(@RequestParam("id") String id) {
   @ResponseBody
   DeferredResult<String> deferredResult() {
     DeferredResult<String> deferredResult = new DeferredResult<>();
-    testBean.asyncDependencyCall(deferredResult);
+    testBean.asyncCall(deferredResult);
     return deferredResult;
   }
 

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/junit/http/ServerEndpoint.java

@@ -48,8 +48,6 @@ public class ServerEndpoint {
       new ServerEndpoint("AUTH_ERROR", "basicsecured/endpoint", 401, null);
   public static final ServerEndpoint INDEXED_CHILD =
       new ServerEndpoint("INDEXED_CHILD", "child", 200, "success");
-  public static final ServerEndpoint DEFERRED_RESULT =
-      new ServerEndpoint("DEFERRED_RESULT", "deferred-result", 200, "deferred result");
 
   public static final String ID_ATTRIBUTE_NAME = "test.request.id";
   public static final String ID_PARAMETER_NAME = "id";