more cleanup

Author: jaydeluca

instrumentation/spring/spring-webflux/spring-webflux-5.0/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v5_0/server/HandlerAdapterInstrumentation.java

@@ -47,10 +47,6 @@ public ElementMatcher<TypeDescription> typeMatcher() {
 
   @Override
   public void transform(TypeTransformer transformer) {
-    // Get the class name being transformed - this requires accessing transformer internals
-    // For now, just log that we're transforming
-    System.out.println("=== HandlerAdapterInstrumentation.transform() called ===");
-    System.out.println("  Applying advice to 'handle' method");
     transformer.applyAdviceToMethod(
         isMethod()
             .and(isPublic())
@@ -59,7 +55,6 @@ public void transform(TypeTransformer transformer) {
             .and(takesArgument(1, Object.class))
             .and(takesArguments(2)),
         this.getClass().getName() + "$HandleAdvice");
-    System.out.println("=== HandlerAdapterInstrumentation advice applied ===");
   }
 
   @SuppressWarnings("unused")
@@ -76,13 +71,7 @@ private AdviceScope(Context context, Scope scope) {
 
       @Nullable
       public static AdviceScope enter(ServerWebExchange exchange, Object handler) {
-        System.out.println("=== HandlerAdapter.enter() called ===");
-        System.out.println(
-            "  Handler: " + (handler != null ? handler.getClass().getName() : "null"));
-        System.out.println("  Thread: " + Thread.currentThread().getName());
-
         Context parentContext = Context.current();
-        System.out.println("  Parent context: " + parentContext);
 
         // HttpRouteSource.CONTROLLER has useFirst true, and it will update http.route only once
         // using the last portion of the nested path.
@@ -93,20 +82,13 @@ public static AdviceScope enter(ServerWebExchange exchange, Object handler) {
             parentContext, HttpServerRouteSource.NESTED_CONTROLLER, httpRouteGetter(), exchange);
 
         if (handler == null) {
-          System.out.println("  Handler is null, returning null");
           return null;
         }
 
-        boolean shouldStart = instrumenter().shouldStart(parentContext, handler);
-        System.out.println("  shouldStart: " + shouldStart);
-
-        if (!shouldStart) {
-          System.out.println("  instrumenter().shouldStart returned false, returning null");
+        if (!instrumenter().shouldStart(parentContext, handler)) {
           return null;
         }
-
         Context context = instrumenter().start(parentContext, handler);
-        System.out.println("  Started new context: " + context);
         return new AdviceScope(context, context.makeCurrent());
       }
 
@@ -132,13 +114,10 @@ public Mono<HandlerResult> exit(
     }
 
     @Nullable
-    @Advice.OnMethodEnter
+    @Advice.OnMethodEnter(suppress = Throwable.class)
     public static AdviceScope methodEnter(
         @Advice.Argument(0) ServerWebExchange exchange, @Advice.Argument(1) Object handler) {
-      System.out.println("=== HandlerAdapter.methodEnter() CALLED ===");
-      AdviceScope scope = AdviceScope.enter(exchange, handler);
-      System.out.println("  Returning AdviceScope: " + scope);
-      return scope;
+      return AdviceScope.enter(exchange, handler);
     }
 
     @AssignReturned.ToReturned
@@ -150,18 +129,11 @@ public static Mono<HandlerResult> methodExit(
         @Advice.Thrown Throwable throwable,
         @Advice.Enter @Nullable AdviceScope adviceScope) {
 
-      System.out.println("=== HandlerAdapter.methodExit() CALLED ===");
-      System.out.println("  AdviceScope: " + adviceScope);
-      System.out.println("  Throwable: " + throwable);
-
       if (adviceScope == null) {
-        System.out.println("  AdviceScope is null, returning original mono");
         return mono;
       }
 
-      Mono<HandlerResult> result = adviceScope.exit(throwable, exchange, handler, mono);
-      System.out.println("  Returning wrapped mono");
-      return result;
+      return adviceScope.exit(throwable, exchange, handler, mono);
     }
   }
 }

instrumentation/spring/spring-webflux/spring-webflux-5.0/testing-webflux7/src/test/java/io/opentelemetry/javaagent/instrumentation/spring/webflux/v7_0/server/base/DelayedHandlerSpringWebFluxServerTest.java

@@ -49,15 +49,13 @@ protected Mono<ServerResponse> wrapResponse(
       return response
           .delayElement(Duration.ofMillis(10))
           .map(
-              original -> {
-                System.out.println("In wrapResponse map for endpoint " + endpoint);
-                return controller(
-                    endpoint,
-                    () -> {
-                      spanAction.run();
-                      return original;
-                    });
-              });
+              original ->
+                  controller(
+                      endpoint,
+                      () -> {
+                        spanAction.run();
+                        return original;
+                      }));
     }
   }
 }

instrumentation/spring/spring-webflux/spring-webflux-5.0/testing/src/main/java/io/opentelemetry/instrumentation/spring/webflux/server/AbstractImmediateHandlerSpringWebFluxServerTest.java

@@ -21,38 +21,6 @@
  */
 public abstract class AbstractImmediateHandlerSpringWebFluxServerTest
     extends AbstractHandlerSpringWebFluxServerTest {
-  //  @Override
-  //  protected Class<?> getApplicationClass() {
-  //    return Application.class;
-  //  }
-
-  //  @Configuration
-  //  @EnableAutoConfiguration
-  //  static class Application {
-  //    @Bean
-  //    RouterFunction<ServerResponse> router() {
-  //      return new RouteFactory().createRoutes();
-  //    }
-  //
-  //    @Bean
-  //    NettyReactiveWebServerFactory nettyFactory() {
-  //      return new NettyReactiveWebServerFactory();
-  //    }
-  //  }
-
-  //  static class RouteFactory extends ServerTestRouteFactory {
-  //
-  //    @Override
-  //    protected Mono<ServerResponse> wrapResponse(
-  //        ServerEndpoint endpoint, Mono<ServerResponse> response, Runnable spanAction) {
-  //      return controller(
-  //          endpoint,
-  //          () -> {
-  //            spanAction.run();
-  //            return response;
-  //          });
-  //    }
-  //  }
 
   @Test
   void nestedPath() {

testing-common/src/main/java/io/opentelemetry/instrumentation/testing/TestInstrumenters.java

@@ -97,23 +97,7 @@ <T, E extends Throwable> T runWithNonRecordingSpan(ThrowingSupplier<T, E> callba
   private static <T, E extends Throwable> T runWithInstrumenter(
       String spanName, Instrumenter<String, Void> instrumenter, ThrowingSupplier<T, E> callback)
       throws E {
-    System.out.println("=== TestInstrumenters.runWithInstrumenter() CALLED ===");
-    System.out.println("  Span name: " + spanName);
-    System.out.println("  Thread: " + Thread.currentThread().getName());
-
-    Context parentContext = Context.current();
-    System.out.println("  Parent context: " + parentContext);
-
-    boolean shouldStart = instrumenter.shouldStart(parentContext, spanName);
-    System.out.println("  shouldStart: " + shouldStart);
-
-    if (!shouldStart) {
-      System.out.println("  Instrumenter refused to start span, running callback without span");
-      return callback.get();
-    }
-
-    Context context = instrumenter.start(parentContext, spanName);
-    System.out.println("  Started context: " + context);
+    Context context = instrumenter.start(Context.current(), spanName);
 
     T result;
     try (Scope ignored = context.makeCurrent()) {
@@ -123,7 +107,6 @@ private static <T, E extends Throwable> T runWithInstrumenter(
       throw t;
     }
     instrumenter.end(context, spanName, null, null);
-    System.out.println("  Span ended successfully");
     return result;
   }
 

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

@@ -121,19 +121,10 @@ protected void configure(HttpServerTestOptions options) {}
 
   public static <T, E extends Throwable> T controller(
       ServerEndpoint endpoint, ThrowingSupplier<T, E> closure) throws E {
-    System.out.println("=== controller() CALLED ===");
-    System.out.println("  Endpoint: " + endpoint);
-    System.out.println("  Thread: " + Thread.currentThread().getName());
-    System.out.println("  Current span: " + Span.current());
-    System.out.println(
-        "  Current span context valid: " + Span.current().getSpanContext().isValid());
-
     assert Span.current().getSpanContext().isValid() : "Controller should have a parent span.";
     if (endpoint == NOT_FOUND) {
-      System.out.println("  Endpoint is NOT_FOUND, skipping controller span");
       return closure.get();
     }
-    System.out.println("  Calling GlobalTraceUtil.runWithSpan('controller', ...)");
     return GlobalTraceUtil.runWithSpan("controller", closure);
   }