fix(contrib/valyala/fasthttp): break circular dependency

Author: darccio

contrib/valyala/fasthttp/fasthttp.go

@@ -25,6 +25,17 @@ func init() {
 
 // WrapHandler wraps a fasthttp.RequestHandler with tracing middleware
 func WrapHandler(h fasthttp.RequestHandler, opts ...Option) fasthttp.RequestHandler {
+	return wrapHandler(h, opts...)
+}
+
+// wrapHandlerWithDefaults is used by go:linkname in orchestrion aspects
+// to avoid circular dependencies. It has a simple signature without variadic
+// arguments so it can be safely referenced via linkname.
+func wrapHandlerWithDefaults(h fasthttp.RequestHandler) fasthttp.RequestHandler {
+	return wrapHandler(h)
+}
+
+func wrapHandler(h fasthttp.RequestHandler, opts ...Option) fasthttp.RequestHandler {
 	cfg := newConfig()
 	for _, fn := range opts {
 		fn.apply(cfg)

contrib/valyala/fasthttp/orchestrion.yml

@@ -18,6 +18,14 @@ aspects:
       - add-struct-field:
           name: '__dd_instrumented'
           type: 'bool'
+      # We need to use go:linkname to refer to wrapHandlerWithDefaults in order to avoid creating
+      # circular dependencies, as contrib/valyala/fasthttp has a dependency on valyala/fasthttp...
+      - inject-declarations:
+          links:
+            - github.com/DataDog/dd-trace-go/contrib/valyala/fasthttp/v2
+          template: |-
+            //go:linkname __dd_fasthttptrace_wrapHandler github.com/DataDog/dd-trace-go/contrib/valyala/fasthttp/v2.wrapHandlerWithDefaults
+            func __dd_fasthttptrace_wrapHandler(RequestHandler) RequestHandler
   # FastHTTP Server instrumentation
   # All server startup methods (ListenAndServe, ServeTLS, etc.) eventually call Serve(ln)
   # By targeting only Serve(), we avoid hot-path overhead and ensure complete coverage
@@ -27,14 +35,12 @@ aspects:
         function:
           - receiver: '*github.com/valyala/fasthttp.Server'
           - name: 'Serve'  # Single entry point for all server startup methods
-    advice:          
+    advice:
       - prepend-statements:
-          imports:
-            fasthttptrace: github.com/DataDog/dd-trace-go/contrib/valyala/fasthttp/v2
           template: |
             {{ $srv := .Function.Receiver }}
             // Only wrap Handler once, even if Serve() is called multiple times
             if !{{ $srv }}.__dd_instrumented && {{ $srv }}.Handler != nil {
-              {{ $srv }}.Handler = fasthttptrace.WrapHandler({{ $srv }}.Handler)
+              {{ $srv }}.Handler = __dd_fasthttptrace_wrapHandler({{ $srv }}.Handler)
               {{ $srv }}.__dd_instrumented = true
             }

internal/orchestrion/_integration/go.mod

@@ -8,7 +8,7 @@ require (
 	github.com/99designs/gqlgen v0.17.83
 	github.com/DataDog/datadog-agent/pkg/proto v0.71.2
 	github.com/DataDog/dd-trace-go/instrumentation/testutils/containers/v2 v2.4.0-dev
-	github.com/DataDog/dd-trace-go/orchestrion/all/v2 v2.4.0-dev
+	github.com/DataDog/dd-trace-go/orchestrion/all/v2 v2.5.0-dev
 	github.com/DataDog/dd-trace-go/v2 v2.5.0-dev
 	github.com/DataDog/go-libddwaf/v4 v4.7.0
 	github.com/DataDog/orchestrion v1.6.1
@@ -469,7 +469,7 @@ replace github.com/DataDog/dd-trace-go/contrib/valyala/fasthttp/v2 => ../../../c
 
 replace github.com/DataDog/dd-trace-go/orchestrion/all/v2 => ../../../orchestrion/all
 
-replace github.com/DataDog/dd-trace-go/v2 => ../../..
+replace github.com/DataDog/dd-trace-go/v2 => github.com/DataDog/dd-trace-go/v2 v2.5.0-dev
 
 replace google.golang.org/grpc => google.golang.org/grpc v1.70.0
 

internal/orchestrion/_integration/go.sum

@@ -806,6 +806,8 @@ github.com/DataDog/datadog-go/v5 v5.8.1 h1:+GOES5W9zpKlhwHptZVW2C0NLVf7ilr7pHkDc
 github.com/DataDog/datadog-go/v5 v5.8.1/go.mod h1:K9kcYBlxkcPP8tvvjZZKs/m1edNAUFzBbdpTUKfCsuw=
 github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.4.0-dev h1:srl0FPpKiginZRfuUCioeUV8gJuTLmNY7pS6AxZl4qQ=
 github.com/DataDog/dd-trace-go/instrumentation/testutils/grpc/v2 v2.4.0-dev/go.mod h1:rG6TpmIBAZEpcNHjD1q/4qtbWNKWw61UH3IS+FsjReQ=
+github.com/DataDog/dd-trace-go/v2 v2.5.0-dev h1:BKDcb+k5FB4FEeUjA+Vb7qJL5g+RyzN/UGd2MrkkRCM=
+github.com/DataDog/dd-trace-go/v2 v2.5.0-dev/go.mod h1:97SyFH3WtMxNizPKpncW0yOMAtBh2j3X9zMP7hKj9lk=
 github.com/DataDog/go-libddwaf/v4 v4.7.0 h1:oF2YaaEtu7MYd5TrwceXUsJYdJ6b1kmLZsAj0up/0po=
 github.com/DataDog/go-libddwaf/v4 v4.7.0/go.mod h1:/AZqP6zw3qGJK5mLrA0PkfK3UQDk1zCI2fUNCt4xftE=
 github.com/DataDog/go-runtime-metrics-internal v0.0.4-0.20250806100345-ca5e7fdaf7b6 h1:rIMZ3Bqn2w8nWrAIXekOdm+sZVxUYHGX8cS7P9W06Kk=