fix the probe name/fingerprint

update tests to assert tags actually present

Author: evanchooly

dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/DebuggerContext.java

@@ -75,8 +75,6 @@ public interface ExceptionDebugger {
   public interface CodeOriginRecorder {
     String captureCodeOrigin(String signature);
 
-    String captureCodeOrigin(AgentSpan span, boolean entry);
-
     String captureCodeOrigin(
         String name, Class<?> target, String method, Class<?>[] types, boolean entry);
   }
@@ -381,18 +379,6 @@ public static String captureCodeOrigin(Function<CodeOriginRecorder, String> func
     return null;
   }
 
-  public static String captureCodeOrigin(AgentSpan span, boolean entry) {
-    try {
-      CodeOriginRecorder recorder = codeOriginRecorder;
-      if (recorder != null) {
-        return recorder.captureCodeOrigin(span, entry);
-      }
-    } catch (Exception ex) {
-      LOGGER.debug("Error in captureCodeOrigin: ", ex);
-    }
-    return null;
-  }
-
   public static String captureCodeOrigin(
       String name, Class<?> target, String method, Class<?>[] types, boolean entry) {
     try {

dd-java-agent/agent-debugger/debugger-bootstrap/src/main/java/datadog/trace/bootstrap/debugger/spanorigin/CodeOriginInfo.java

@@ -29,12 +29,6 @@ public static void entry(Class<?> type, Method method) {
     }
   }
 
-  public static void entry(AgentSpan span) {
-    if (InstrumenterConfig.get().isCodeOriginEnabled()) {
-      captureCodeOrigin(span, true);
-    }
-  }
-
   public static void entry(String name, Class<?> target, String method, Class<?>[] types) {
     if (InstrumenterConfig.get().isCodeOriginEnabled()) {
       captureCodeOrigin(name, target, method, types, true);

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/codeorigin/DefaultCodeOriginRecorder.java

@@ -8,7 +8,6 @@
 import com.datadog.debugger.exception.Fingerprinter;
 import com.datadog.debugger.probe.CodeOriginProbe;
 import com.datadog.debugger.probe.Where;
-import com.datadog.debugger.util.ClassFileLines;
 import com.datadog.debugger.util.ClassNameFiltering;
 import datadog.trace.api.Config;
 import datadog.trace.bootstrap.debugger.CapturedContext;
@@ -26,14 +25,12 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.MethodNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -140,15 +137,10 @@ public String captureCodeOrigin(String signature) {
   @Override
   public String captureCodeOrigin(
       String name, Class<?> target, String method, Class<?>[] types, boolean entry) {
-    String fingerprint = Fingerprinter.fingerprint(name);
-    if (fingerprint == null) {
-      LOG.debug("Unable to fingerprint stack trace");
-      return null;
-    }
     CodeOriginProbe probe;
 
-    if (isAlreadyInstrumented(fingerprint)) {
-      probe = fingerprints.get(fingerprint);
+    if (isAlreadyInstrumented(name)) {
+      probe = fingerprints.get(name);
     } else {
       Where where =
           Where.of(
@@ -162,48 +154,7 @@ public String captureCodeOrigin(
               where.getSignature(),
               where,
               maxUserFrames);
-      addFingerprint(fingerprint, probe);
-
-      installProbe(probe);
-      // committing here manually so that first run probe encounters decorate the span until the
-      // instrumentation gets installed
-      probe.commit(
-          CapturedContext.EMPTY_CONTEXT, CapturedContext.EMPTY_CONTEXT, Collections.emptyList());
-    }
-
-    return probe.getId();
-  }
-
-  @Override
-  public String captureCodeOrigin(AgentSpan span, boolean entry) {
-    String fingerprint = Fingerprinter.fingerprint(span.getResourceName());
-    if (fingerprint == null) {
-      LOG.debug("Unable to fingerprint stack trace");
-      return null;
-    }
-    CodeOriginProbe probe;
-
-    if (isAlreadyInstrumented(fingerprint)) {
-      probe = fingerprints.get(fingerprint);
-    } else {
-      StackTraceElement element = findPlaceInStack();
-      ClassNode classNode = parseClassFile(element.getClassName());
-      ClassFileLines lines = new ClassFileLines(classNode);
-      List<MethodNode> methodsByLine = lines.getMethodsByLine(element.getLineNumber());
-      Where where =
-          Where.of(
-              element.getClassName(),
-              element.getMethodName(),
-              "FIX ME",
-              String.valueOf(element.getLineNumber()));
-
-      probe =
-          new CodeOriginProbe(
-              new ProbeId(UUID.randomUUID().toString(), 0),
-              where.getSignature(),
-              where,
-              maxUserFrames);
-      addFingerprint(fingerprint, probe);
+      addFingerprint(name, probe);
 
       installProbe(probe);
       // committing here manually so that first run probe encounters decorate the span until the

dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/server/MethodHandlersInstrumentation.java

@@ -8,6 +8,7 @@
 import datadog.trace.agent.tooling.Instrumenter.ForTypeHierarchy;
 import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.bootstrap.debugger.spanorigin.CodeOriginInfo;
+import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
@@ -17,7 +18,7 @@
 public class MethodHandlersInstrumentation extends InstrumenterModule.Tracing
     implements ForTypeHierarchy {
   private static final ElementMatcher<TypeDescription> METHOD_HANDLERS =
-      nameEndsWith("MethodHandlers");
+      nameEndsWith("$MethodHandlers");
 
   public MethodHandlersInstrumentation() {
     super("grpc-server-code-origin");
@@ -44,20 +45,28 @@ public static class BuildAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
     public static void onEnter(@Advice.Argument(0) Object serviceImpl) {
-      Class<?> serviceClass = serviceImpl.getClass();
-      Method[] methods = serviceClass.getSuperclass().getDeclaredMethods();
-      for (Method method : methods) {
-        try {
-          Method declaredMethod =
-              serviceClass.getDeclaredMethod(method.getName(), method.getParameterTypes());
-          CodeOriginInfo.entry(
-              "testing",
-              serviceClass,
-              declaredMethod.getName(),
-              declaredMethod.getParameterTypes());
-        } catch (NoSuchMethodException e) {
-          // service method not override on the impl.  skipping instrumentation
+      try {
+        Class<?> serviceClass = serviceImpl.getClass();
+        Class<?> superclass = serviceClass.getSuperclass();
+        Class<?> enclosingClass = superclass.getEnclosingClass();
+        Field serviceNameField = enclosingClass.getDeclaredField("SERVICE_NAME");
+        String serviceName = (String) serviceNameField.get(enclosingClass);
+        for (Method method : superclass.getDeclaredMethods()) {
+          try {
+            Method declaredMethod =
+                serviceClass.getDeclaredMethod(method.getName(), method.getParameterTypes());
+            CodeOriginInfo.entry(
+                String.format("%s/%s", serviceName, method.getName()),
+                serviceClass,
+                declaredMethod.getName(),
+                declaredMethod.getParameterTypes());
+          } catch (NoSuchMethodException e) {
+            // service method not override on the impl.  skipping instrumentation
+          }
         }
+      } catch (ReflectiveOperationException e) {
+        // need to find a way to log this
+        //        LOG.debug("Member not found.  Not instrumenting {}", serviceClass.getName(), e);
       }
     }
   }