grpc code origin test working

Author: evanchooly

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

@@ -1,8 +1,6 @@
 import com.google.common.util.concurrent.MoreExecutors
 import datadog.trace.agent.test.naming.VersionedNamingTestBase
-import datadog.trace.api.DDSpanTypes
 import datadog.trace.bootstrap.debugger.DebuggerContext
-import datadog.trace.bootstrap.instrumentation.api.Tags
 import example.GreeterGrpc
 import example.Helloworld
 import io.grpc.BindableService
@@ -17,6 +15,8 @@ import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicReference
 
+import static datadog.trace.agent.test.asserts.TagsAssert.assertTags
+
 
 abstract class GrpcCodeOriginTest extends VersionedNamingTestBase {
   @Override
@@ -51,7 +51,7 @@ abstract class GrpcCodeOriginTest extends VersionedNamingTestBase {
     codeOriginSetup()
   }
 
-  def "test conversation #name"() {
+  def "code origin test #name"() {
     setup:
 
     def msgCount = serverMessageCount
@@ -151,75 +151,12 @@ abstract class GrpcCodeOriginTest extends VersionedNamingTestBase {
     }.flatten().sort()
 
     assert DebuggerContext.codeOriginRecorder != null
-    assertTraces(2) {
-      trace((hasClientMessageSpans() ? clientMessageCount * serverMessageCount : 0) + 1) {
-        span {
-          operationName clientOperation()
-          resourceName "example.Greeter/Conversation"
-          spanType DDSpanTypes.RPC
-          parent()
-          errored false
-          tags {
-            "$Tags.COMPONENT" "grpc-client"
-            "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
-            "$Tags.RPC_SERVICE" "example.Greeter"
-            "status.code" "OK"
-            "request.type" "example.Helloworld\$Response"
-            "response.type" "example.Helloworld\$Response"
-            peerServiceFrom(Tags.RPC_SERVICE)
-            defaultTags()
-          }
-        }
-        if (hasClientMessageSpans()) {
-          (1..(clientMessageCount * serverMessageCount)).each {
-            span {
-              operationName "grpc.message"
-              resourceName "grpc.message"
-              spanType DDSpanTypes.RPC
-              childOf span(0)
-              errored false
-              tags {
-                "$Tags.COMPONENT" "grpc-client"
-                "$Tags.SPAN_KIND" Tags.SPAN_KIND_CLIENT
-                "message.type" "example.Helloworld\$Response"
-                defaultTagsNoPeerService()
-              }
-            }
-          }
-        }
-      }
-      trace(clientMessageCount + 1) {
-        span {
-          operationName serverOperation()
-          resourceName "example.Greeter/Conversation"
-          spanType DDSpanTypes.RPC
-          childOf trace(0).get(0)
-          errored false
-          tags {
-            "$Tags.COMPONENT" "grpc-server"
-            "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
-            "status.code" "OK"
-
-            defaultTags(true)
-          }
-        }
-        clientRange.each {
-          span {
-            operationName "grpc.message"
-            resourceName "grpc.message"
-            spanType DDSpanTypes.RPC
-            childOf span(0)
-            errored false
-            tags {
-              "$Tags.COMPONENT" "grpc-server"
-              "$Tags.SPAN_KIND" Tags.SPAN_KIND_SERVER
-              "message.type" "example.Helloworld\$Response"
-              defaultTags()
-            }
-          }
-        }
-      }
+    def span = TEST_WRITER.flatten().find {
+      it.operationName.toString() == "grpc.server.request"
     }
+    assertTags(span, {
+      it.codeOriginTags()
+    }, false)
 
     cleanup:
     channel?.shutdownNow()?.awaitTermination(10, TimeUnit.SECONDS)

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

@@ -92,7 +92,6 @@ import static datadog.trace.api.config.TraceInstrumentationConfig.CODE_ORIGIN_FO
 import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.closePrevious
 import static datadog.trace.util.AgentThreadFactory.AgentThread.TASK_SCHEDULER
 import static org.mockito.Mockito.mock
-import static org.mockito.Mockito.when
 
 /**
  * A spock test runner which automatically applies instrumentation and exposes a global trace
@@ -325,20 +324,7 @@ abstract class AgentTestRunner extends DDSpecification implements AgentBuilder.L
 
     def sink = new DebuggerSink(config, probeStatusSink)
     ConfigurationUpdater configurationUpdater = new ConfigurationUpdater(INSTRUMENTATION, DebuggerTransformer::new, config, sink,
-    new ClassesToRetransformFinder()) {
-      @Override
-      ProbeImplementation resolve(String encodedProbeId) {
-        AgentSpan span = AgentTracer.activeSpan()
-        if (span != null) {
-          span.setTag("code origin span", true)
-        }
-        def resolve = super.resolve(encodedProbeId)
-
-        println("************* resolve() \n\tspan = " + span + "\n\t probe = " + resolve)
-
-        return resolve
-      }
-    }
+    new ClassesToRetransformFinder())
 
     INSTRUMENTATION.addTransformer(new DebuggerTransformer(config, configuration, {
       ProbeDefinition definition, InstrumentationResult result ->

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

@@ -115,12 +115,6 @@ class TagsAssert {
   }
 
   def codeOriginTags() {
-    assertedTags.add(DDTags.DD_CODE_ORIGIN_TYPE)
-    assertedTags.add(format(DD_CODE_ORIGIN_FRAME, 0, "file"))
-    assertedTags.add(format(DD_CODE_ORIGIN_FRAME, 0, "method"))
-    assertedTags.add(format(DD_CODE_ORIGIN_FRAME, 0, "line"))
-    assertedTags.add(format(DD_CODE_ORIGIN_FRAME, 0, "type"))
-    assertedTags.add(format(DD_CODE_ORIGIN_FRAME, 0, "signature"))
     assertedTags.add("code origin span")
 
     assert tags[DDTags.DD_CODE_ORIGIN_TYPE] != null