sling: cleanup some traces and commented out code

Author: rombert

instrumentation/sling/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sling/ServletResolverInstrumentation.java

@@ -40,21 +40,6 @@ public void transform(TypeTransformer transformer) {
 
   @SuppressWarnings("unused")
   public static class ResolveServletAdvice {
-    @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        @Advice.Argument(0) SlingHttpServletRequest request,
-        @Advice.Local("otelContext") Context context,
-        @Advice.Local("otelScope") Scope scope) {
-
-//      Context parentContext = Java8BytecodeBridge.currentContext();
-//
-//      if (!helper().shouldStart(parentContext, request)) {
-//        return;
-//      }
-//
-//      context = helper().start(parentContext, request);
-//      scope = context.makeCurrent();
-    }
 
     @Advice.OnMethodExit(suppress = Throwable.class, onThrowable = Throwable.class)
     public static void onExit(
@@ -64,11 +49,6 @@ public static void onExit(
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope) {
 
-//      if (scope == null) {
-//        return;
-//      }
-//      scope.close();
-
       // TODO - copied from RequestUtil
       String name = null;
 
@@ -89,12 +69,7 @@ public static void onExit(
         request.setAttribute(REQUEST_ATTR_RESOLVED_SERVLET_NAME, servletNames);
       }
       servletNames.addLast(name);
-      System.out.format("SLING TRACE resolved name %s for servlet %s; current stack is %s%n", name, servlet, servletNames);
-
-//      Span.fromContext(context).updateName(name);
-//      HttpServerRoute.update(context, HttpServerRouteSource.CONTROLLER, name);
-//
-//      helper().end(context, request, null, throwable);
+      System.out.format("SLING TRACE resolved name %s for uri=%s, current stack is %s%n", name, request.getRequestURI(), servletNames);
     }
   }
 }

instrumentation/sling/javaagent/src/main/java/io/opentelemetry/javaagent/instrumentation/sling/SlingSafeMethodsServletInstrumentation.java

@@ -27,8 +27,6 @@
 public class SlingSafeMethodsServletInstrumentation implements TypeInstrumentation {
   @Override
   public ElementMatcher<TypeDescription> typeMatcher() {
-    System.out.format("SLING TRACE Got asked about typeMatcher%n");
-//    return named("org.apache.sling.api.servlets.SlingSafeMethodsServlet");
     return AgentElementMatchers.implementsInterface(named("javax.servlet.Servlet"));
   }
 
@@ -40,17 +38,13 @@ public ElementMatcher<ClassLoader> classLoaderOptimization() {
   @Override
   public void transform(TypeTransformer transformer) {
 
-    System.out.format("SLING TRACE transforming using %s%n", transformer);
-
     String adviceClassName = this.getClass().getName() + "$ServiceServletAdvice";
     transformer.applyAdviceToMethod(
         named("service")
             .and(takesArguments(2))
             .and(takesArgument(0, named("javax.servlet.ServletRequest")))
             .and(takesArgument(1, named("javax.servlet.ServletResponse"))),
         adviceClassName);
-
-    System.out.format("SLING TRACE transformed using %s ; adviceClassName = %s %n", transformer, adviceClassName);
   }
 
   @SuppressWarnings("unused")
@@ -62,12 +56,12 @@ public static void onEnter(
         @Advice.Local("otelContext") Context context,
         @Advice.Local("otelScope") Scope scope) {
 
-      System.out.format("SLING TRACE Handling request %s%n", request);
-
       if ( !(request instanceof SlingHttpServletRequest) ) {
         return;
       }
 
+      System.out.format("SLING TRACE Handling request %s%n", request);
+
       SlingHttpServletRequest slingRequest = (SlingHttpServletRequest) request;
 
       Context parentContext = Java8BytecodeBridge.currentContext();