Add a two way check with _dd.integration

Author: amarziali

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

@@ -33,6 +33,7 @@ import datadog.metrics.impl.MonitoringImpl
 import datadog.metrics.api.statsd.StatsDClient
 import datadog.instrument.classinject.ClassInjector
 import datadog.trace.agent.test.asserts.ListWriterAssert
+import datadog.trace.agent.test.asserts.TagsAssert
 import datadog.trace.agent.test.datastreams.MockFeaturesDiscovery
 import datadog.trace.agent.test.datastreams.RecordingDatastreamsPayloadWriter
 import datadog.trace.agent.tooling.AgentInstaller
@@ -405,8 +406,11 @@ abstract class InstrumentationSpecification extends DDSpecification implements A
     TracerInstaller.forceInstallGlobalTracer(TEST_TRACER)
 
     boolean enabledFinishTimingChecks = this.enabledFinishTimingChecks()
-    TEST_TRACER.startSpan(*_) >> {
+    TEST_TRACER.startSpan(*_) >> { Object[] args ->
       AgentSpan agentSpan = callRealMethod()
+      if (args.length > 0 && args[0] instanceof String) {
+        TagsAssert.INSTRUMENTATION_NAMES[agentSpan.spanId] = (String) args[0]
+      }
       if (!enabledFinishTimingChecks) {
         return agentSpan
       }

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

@@ -11,16 +11,22 @@ import datadog.trace.common.writer.ddagent.TraceMapper
 import datadog.trace.core.DDSpan
 import groovy.transform.stc.ClosureParams
 import groovy.transform.stc.SimpleType
+import java.util.concurrent.ConcurrentHashMap
 import java.util.regex.Pattern
 
 class TagsAssert {
+  // Populated by the InstrumentationSpecification spy; keyed by span ID.
+  static final Map<Long, String> INSTRUMENTATION_NAMES = new ConcurrentHashMap<>()
+
   private final long spanParentId
+  private final long spanId
   private final Map<String, Object> tags
   private final String serviceName
   private final Set<String> assertedTags = new TreeSet<>()
 
   private TagsAssert(DDSpan span) {
     this.spanParentId = span.parentId
+    this.spanId = span.spanId
     this.tags = span.tags
     this.serviceName = span.getServiceName()
   }
@@ -107,6 +113,11 @@ class TagsAssert {
     if (assertedTags.add(DDTags.DD_INTEGRATION) && tags[Tags.COMPONENT] != null) {
       assert tags[Tags.COMPONENT].toString() == tags[DDTags.DD_INTEGRATION].toString()
     }
+    String capturedInstrumentationName = INSTRUMENTATION_NAMES.remove(spanId)
+    if (capturedInstrumentationName != null && capturedInstrumentationName != "test" && tags[DDTags.DD_INTEGRATION] != null) {
+      assert tags[DDTags.DD_INTEGRATION].toString() == capturedInstrumentationName :
+      "DD_INTEGRATION '${tags[DDTags.DD_INTEGRATION]}' != instrumentationName '${capturedInstrumentationName}' passed to startSpan()"
+    }
 
     assert tags["thread.name"] != null
     assert tags["thread.id"] != null

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

@@ -3,6 +3,7 @@ package datadog.trace.agent.test.utils
 import datadog.trace.agent.test.asserts.TraceAssert
 import datadog.trace.bootstrap.instrumentation.api.AgentScope
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
+import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext
 import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator
 import datadog.trace.core.DDSpan
 
@@ -44,7 +45,7 @@ class TraceUtils {
   }
 
   static <T> T runUnderTrace(final String rootOperationName, final boolean inheritCurrent, final boolean async, final Callable<T> r) {
-    final AgentSpan span = inheritCurrent ? startSpan(rootOperationName) : startSpan(rootOperationName, null)
+    final AgentSpan span = inheritCurrent ? startSpan("test", rootOperationName) : startSpan("test", rootOperationName, (AgentSpanContext) null)
     DECORATOR.afterStart(span)
 
     AgentScope scope = activateSpan(span)