Merge pull request #25 from google/2017-updates

Moved the replace call from the bytecode to the sampler

Author: jhmanson

src/main/java/com/google/monitoring/runtime/instrumentation/AllocationMethodAdapter.java

@@ -147,13 +147,6 @@ private void pushClassNameOnStack() {
     super.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/Class",
         "getName", "()Ljava/lang/String;", false);
     // -> stack: ... class classNameDotted
-    super.visitLdcInsn('.');
-    // -> stack: ... class classNameDotted '.'
-    super.visitLdcInsn('/');
-    // -> stack: ... class classNameDotted '.' '/'
-    super.visitMethodInsn(Opcodes.INVOKEVIRTUAL, "java/lang/String",
-        "replace", "(CC)Ljava/lang/String;", false);
-    // -> stack: ... class className
   }
 
   // Helper method to compute the product of an integer array and push it on

src/main/java/com/google/monitoring/runtime/instrumentation/AllocationRecorder.java

@@ -231,6 +231,10 @@ public static void recordAllocation(int count, String desc, Object newObj) {
     // optional samplers.  However, you don't need the optional samplers in
     // the common case, so I thought I'd save some space.
 
+    if (count >= 0) {
+      desc = desc.replace('.', '/');
+    }
+
     // Copy value into local variable to prevent NPE that occurs when
     // instrumentation field is set to null by this class's shutdown hook
     // after another thread passed the null check but has yet to call