suggestions

amarziali · amarziali · commit a7fab126e883 · 2026-05-05T16:35:01.000+02:00
diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/InstrumentationSpecification.groovy
@@ -56,7 +56,6 @@ import datadog.trace.bootstrap.ActiveSubsystems
 import datadog.trace.bootstrap.InstrumentationErrors
 import datadog.trace.bootstrap.debugger.DebuggerContext
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
-import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext
 import datadog.trace.bootstrap.instrumentation.api.AgentTracer
 import datadog.trace.common.metrics.EventListener
 import datadog.trace.common.metrics.Sink
@@ -409,17 +408,8 @@ abstract class InstrumentationSpecification extends DDSpecification implements A
     TracerInstaller.forceInstallGlobalTracer(TEST_TRACER)
 
     boolean enabledFinishTimingChecks = this.enabledFinishTimingChecks()
-    TEST_TRACER.startSpan(_ as String, _ as CharSequence) >> { String instrName, CharSequence spanName ->
-      trackStartSpan(callRealMethod(), instrName, enabledFinishTimingChecks)
-    }
-    TEST_TRACER.startSpan(_ as String, _ as CharSequence, _ as Long) >> { String instrName, CharSequence spanName, long micros ->
-      trackStartSpan(callRealMethod(), instrName, enabledFinishTimingChecks)
-    }
-    TEST_TRACER.startSpan(_ as String, _ as CharSequence, _ as AgentSpanContext) >> { String instrName, CharSequence spanName, AgentSpanContext ctx ->
-      trackStartSpan(callRealMethod(), instrName, enabledFinishTimingChecks)
-    }
-    TEST_TRACER.startSpan(_ as String, _ as CharSequence, _ as AgentSpanContext, _ as Long) >> { String instrName, CharSequence spanName, AgentSpanContext ctx, long micros ->
-      trackStartSpan(callRealMethod(), instrName, enabledFinishTimingChecks)
+    TEST_TRACER.startSpan(*_) >> { args ->
+      trackStartSpan(callRealMethod(), args[0] as String, enabledFinishTimingChecks)
     }
 
     ClassInjector.enableClassInjection(INSTRUMENTATION)
