Remove extraneous debug code

Author: nr-kateanderson

newrelic-agent/src/main/java/com/newrelic/agent/instrumentation/weaver/ClassLoaderClassTransformer.java

@@ -293,7 +293,6 @@ public byte[] transform(ClassLoader loader, String className, Class<?> classBein
         if (observedClassLoaders.containsKey(superName) ||
                 classloadersToInclude.contains(reader.getClassName()) || classloadersToInclude.contains(superName)) {
             byte[] finalClassBytes = transform(loader, className, classBeingRedefined, protectionDomain, classfileBuffer, null, null);
-            //WeaveUtils.createReadableClassFileFromByteArray(finalClassBytes, true, className, "ClassLoader", "/Users/katherineanderson/Downloads");
             return finalClassBytes;
         }
         return null;
@@ -325,11 +324,6 @@ public byte[] transform(ClassLoader loader, String className, Class<?> classBein
             // we don't need to worry about it possibly using findResource() when we call validate(cache).
             ClassCache cache = new ClassCache(new ClassLoaderClassFinder(observedClassLoaders));
 
-            //DEBUG TIME: how does the base classloader fare???
-            if(className.equals("java/lang/ClassLoader")){
-                WeaveUtils.forceVisitationOfClassFile(classfileBuffer, cache);
-            }
-
             PackageValidationResult result;
             if (className.equals("java/lang/ClassLoader")) {
                 // For "java.lang.ClassLoader" we only want to instrument one of the loadClass() methods
@@ -381,11 +375,6 @@ public byte[] transform(ClassLoader loader, String className, Class<?> classBein
                                                                    cache, skipMethods);
                 // Do the weaving and use our "non-findResource" cache from above
                 newBytes = packageWeaveResult.getCompositeBytes(cache);
-                if (className.equals("java/lang/ClassLoader")){
-                    //WeaveUtils.printClassFrames(newBytes);
-                    //WeaveUtils.createReadableClassFileFromByteArray(newBytes, className, "ClassLoader", "/Users/katherineanderson/Downloads");
-                    //VerifierImpl.verify(ClassFile(newBytes), s -> System.out.println(s));
-                }
 
                 if (newBytes != null) {
                     Agent.LOG.log(Level.FINE, "ClassLoaderClassTransformer patched {0} -- {1}", loader, className);

newrelic-weaver/src/main/java/com/newrelic/weave/utils/WeaveUtils.java

@@ -36,11 +36,6 @@
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.TypeInsnNode;
-import org.objectweb.asm.tree.analysis.Analyzer;
-import org.objectweb.asm.tree.analysis.AnalyzerException;
-import org.objectweb.asm.tree.analysis.BasicInterpreter;
-import org.objectweb.asm.tree.analysis.BasicValue;
-import org.objectweb.asm.tree.analysis.Frame;
 import org.objectweb.asm.util.Textifier;
 import org.objectweb.asm.util.TraceMethodVisitor;
 
@@ -550,91 +545,6 @@ public static ClassNode convertToClassNode(byte[] classBytes) {
         return result;
     }
 
-    //make an analyzer
-
-    private static void printMethodAnalysis(String owner, MethodNode method) throws AnalyzerException {
-        System.out.println("Analyzing method: " + method.name);
-        BasicInterpreter interpreter = new BasicInterpreter();
-        Analyzer<BasicValue> a = new Analyzer<>(interpreter);
-        Frame<BasicValue>[] frames = a.analyze(owner, method);
-        Map<AbstractInsnNode, Integer> rtStacks = new HashMap<>();
-        for (int j = 0; j < method.instructions.size(); ++j) {
-            AbstractInsnNode insn = method.instructions.get(j);
-            Frame<BasicValue> frame = frames[j];
-            if (frame != null) {
-                System.out.println("Locals: " + stringLocals(frame) + " stack: " + stringStack(frame) + " " + stringifyInstruction(insn));
-            }
-        }
-    }
-
-    private static String stringLocals(Frame<BasicValue> frame) {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < frame.getLocals(); i++) {
-            BasicValue value = frame.getLocal(i);
-            sb.append(value);
-            sb.append(" . ");
-        }
-        return sb.toString();
-    }
-
-    private static String stringStack(Frame<BasicValue> frame) {
-        StringBuilder sb = new StringBuilder();
-        for (int i = 0; i < frame.getStackSize(); i++) {
-            BasicValue value = frame.getStack(i);
-            sb.append(value);
-            sb.append(" . ");
-        }
-        return sb.toString();
-    }
-
-    //print class node
-    public static void printClassFrames(byte [] classBytes) {
-        ClassReader reader = new ClassReader(classBytes);
-        ClassNode cn = new ClassNode();
-        reader.accept(cn, 0);
-        for (MethodNode methodNode : cn.methods) {
-            try {
-                printMethodAnalysis(cn.name, methodNode);
-            } catch (AnalyzerException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    //TEMPORARY
-
-    public static void forceVisitationOfClassFile(byte[] classBytes, ClassInformationFinder classInfoFinder) {
-        ClassReader reader = new ClassReader(classBytes);
-        ClassWriter cw = new PatchedClassWriter(ClassWriter.COMPUTE_FRAMES, classInfoFinder);
-        reader.accept(cw, ClassReader.EXPAND_FRAMES);
-    }
-
-    public static void getInstructionAtBCI(int bci, byte [] classBytes) {
-        int bciMargin = 3;
-        ClassReader reader = new ClassReader(classBytes);
-        ClassNode cn = new ClassNode();
-        reader.accept(cn, 0);
-        for (MethodNode methodNode : cn.methods) {
-            int currentBytecodeIndex = 0;
-            for (AbstractInsnNode instruction : methodNode.instructions) {
-                if (instruction.getType() != AbstractInsnNode.LABEL &&
-                        instruction.getType() != AbstractInsnNode.LINE &&
-                        instruction.getType() != AbstractInsnNode.FRAME) {
-
-                    if (currentBytecodeIndex > bci - bciMargin || currentBytecodeIndex < bci + bciMargin) {
-                        if (currentBytecodeIndex == bci) {
-                            System.out.print("Target Instruction >>>>>");
-                        }
-                        System.out.println("bci: " + currentBytecodeIndex + " " + stringifyInstruction(instruction));
-                    }
-                    currentBytecodeIndex++;
-                }
-
-            }
-            System.out.println("Finished instrumenting method: " + methodNode.name);
-        }
-    }
-
     public static void createReadableClassFileFromClassNode(ClassNode cn, boolean isNew, String originalName, String targetName, String destDir) {
         if (targetName == null || originalName.contains(targetName)) {
             System.out.println("Weaved composite ClassLoader");