Merge pull request #1575 from newrelic/1574-normalize-proxy-names

Normalize CGLIB proxied class names
Merging - failing infinite tracing test has been removed.

newrelic-agent/src/main/java/com/newrelic/agent/instrumentation/pointcuts/frameworks/spring/MethodInvokerPointCut.java

@@ -77,11 +77,19 @@ protected void setTransactionName(Transaction transaction, String methodName, Cl
     }
 
     private String getControllerName(String methodName, Class<?> controller) {
-        String controllerName = isUseFullPackageName() ? controller.getName() : controller.getSimpleName();
-        int indexOf = controllerName.indexOf(TO_REMOVE);
-        if (indexOf > 0) {
-            controllerName = controllerName.substring(0, indexOf);
-        }
+        Class<?> originalClass = getOriginalClassIfProxied(controller);
+        String controllerName = isUseFullPackageName() ? originalClass.getName() : originalClass.getSimpleName();
         return '/' + controllerName + '/' + methodName;
     }
+
+    private Class<?> getOriginalClassIfProxied(Class<?> clazz) {
+        if (clazz.getName().contains("$$")) {
+            Class<?> superclass = clazz.getSuperclass();
+            if (superclass != null && superclass != Object.class) {
+                return superclass;
+            }
+        }
+
+        return clazz;
+    }
 }