entry span support for grpc servers working

Author: evanchooly

dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/probe/Where.java

@@ -47,7 +47,7 @@ public static Where of(String typeName, String methodName, String signature, Str
   }
 
   protected static SourceLine[] sourceLines(String[] defs) {
-    if (defs == null) {
+    if (defs == null || defs.length == 0) {
       return null;
     }
     SourceLine[] lines = new SourceLine[defs.length];
@@ -72,7 +72,7 @@ public static Where convertLineToMethod(Where lineWhere, ClassFileLines classFil
             null);
       }
     }
-    throw new IllegalArgumentException("Invalid where to convert from line to method " + lineWhere);
+    return lineWhere;
   }
 
   public String getTypeName() {

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

@@ -9,7 +9,6 @@
 import datadog.trace.agent.tooling.InstrumenterModule;
 import datadog.trace.bootstrap.debugger.spanorigin.CodeOriginInfo;
 import java.lang.reflect.Method;
-import java.util.Arrays;
 import net.bytebuddy.asm.Advice;
 import net.bytebuddy.description.type.TypeDescription;
 import net.bytebuddy.matcher.ElementMatcher;
@@ -22,7 +21,6 @@ public class MethodHandlersInstrumentation extends InstrumenterModule.Tracing
 
   public MethodHandlersInstrumentation() {
     super("grpc-server-code-origin");
-    System.out.println("MethodHandlersInstrumentation.MethodHandlersInstrumentation");
   }
 
   @Override
@@ -45,16 +43,21 @@ public void methodAdvice(MethodTransformer transformer) {
   public static class BuildAdvice {
 
     @Advice.OnMethodEnter(suppress = Throwable.class)
-    public static void onEnter(
-        /*@Advice.This Object handler,*/ @Advice.Argument(0) Object serviceImpl) {
+    public static void onEnter(@Advice.Argument(0) Object serviceImpl) {
       Class<?> serviceClass = serviceImpl.getClass();
-      System.out.println(
-          "****** BuildAdvice.onEnter serviceImpl = "
-              + Arrays.toString(serviceClass.getInterfaces()));
       Method[] methods = serviceClass.getSuperclass().getDeclaredMethods();
-      System.out.println("****** BuildAdvice.onEnter methods = " + Arrays.toString(methods));
       for (Method method : methods) {
-        CodeOriginInfo.entry("testing", serviceClass, method.getName(), method.getParameterTypes());
+        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
+        }
       }
     }
   }

dd-java-agent/instrumentation/grpc-1.5/src/test/groovy/GrpcStreamingTest.groovy

@@ -215,7 +215,7 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase {
             "$Tags.COMPONENT" "grpc-server"
             "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
             "status.code" "OK"
-            defaultTags(true)
+            codeOriginTags(true)
           }
         }
         clientRange.each {
@@ -271,21 +271,15 @@ abstract class GrpcStreamingTest extends VersionedNamingTestBase {
     when(config.getFinalDebuggerSnapshotUrl())
     .thenReturn("http://localhost:8126/debugger/v1/input")
     when(config.getFinalDebuggerSymDBUrl()).thenReturn("http://localhost:8126/symdb/v1/input")
+    when(config.getDebuggerCodeOriginMaxUserFrames()).thenReturn(8)
+
     def probeStatusSink = mock(ProbeStatusSink.class)
     def instr = ByteBuddyAgent.install()
 
-
     def sink = new DebuggerSink(config, probeStatusSink)
-    def configurationUpdater =
-    new ConfigurationUpdater(
-    instr,
-    DebuggerTransformer::new,
-    config,
-    sink,
-    new ClassesToRetransformFinder())
-
-    def currentTransformer =
-    new DebuggerTransformer(config, configuration, {
+    def configurationUpdater = new ConfigurationUpdater(instr, DebuggerTransformer::new, config, sink, new ClassesToRetransformFinder())
+
+    def currentTransformer = new DebuggerTransformer(config, configuration, {
       ProbeDefinition definition, InstrumentationResult result ->
     }, sink)
     instr.addTransformer(currentTransformer)

dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/asserts/TagsAssert.groovy

@@ -49,6 +49,16 @@ class TagsAssert {
     defaultTags(distributedRootSpan, false)
   }
 
+  def codeOriginTags(boolean distributedRootSpan = false, boolean checkPeerService = true) {
+    defaultTags(distributedRootSpan, checkPeerService)
+    assertedTags.add(DDTags.DD_CODE_ORIGIN_TYPE)
+    for (i in 0..<8) {
+      for (tag in ["file", "line", "method", "signature", "snapshot_id", "type"]) {
+        assertedTags.add(String.format(DDTags.DD_CODE_ORIGIN_FRAME, i, tag))
+      }
+    }
+  }
+
   /**
    * @param distributedRootSpan set to true if current span has a parent span but still considered 'root' for current service
    */