[sc-12075] request: add span on ctx

middleware.go

@@ -1,6 +1,11 @@
 package goyavetrace
 
-import "goyave.dev/goyave/v4"
+import (
+	"net/http"
+
+	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
+	"goyave.dev/goyave/v4"
+)
 
 // Middleware substitutes the original response writer with a trace writer wrapper.
 type Middleware struct {
@@ -15,6 +20,15 @@ func (m Middleware) Handle(next goyave.Handler) goyave.Handler {
 	return func(resp *goyave.Response, req *goyave.Request) {
 		traceWriter := NewWriter(resp, req, m.SpanOption)
 		resp.SetWriter(traceWriter)
-		next(resp, req)
+
+		ctx := req.Request().Context()
+		ctx = tracer.ContextWithSpan(ctx, traceWriter.span)
+
+		goyave.NativeMiddleware(func(h http.Handler) http.Handler {
+			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+				r = r.WithContext(ctx)
+				h.ServeHTTP(w, r)
+			})
+		})(next)(resp, req)
 	}
 }

middleware_test.go

@@ -140,6 +140,64 @@ func (suite *MiddlewareTestSuite) TestWriterWithError() {
 	})
 }
 
+func (suite *MiddlewareTestSuite) TestSpanContext() {
+	err := config.LoadJSON(`{"app": {"environment": "test", "datadog": {"service": "service-name"}}}`)
+	if !suite.NoError(err) {
+		return
+	}
+
+	mt := mocktracer.Start()
+	defer mt.Stop()
+	suite.RunServer(func(r *goyave.Router) {
+		r.GlobalMiddleware((&Middleware{
+			SpanOption: func(s tracer.Span, resp *goyave.Response, req *goyave.Request) {
+				suite.NotNil(resp)
+				suite.NotNil(req)
+				s.SetTag(ext.ManualKeep, true)
+			},
+		}).Handle)
+		r.Get("/test", func(response *goyave.Response, request *goyave.Request) {
+			ctx := request.Request().Context()
+
+			span, _ := tracer.StartSpanFromContext(ctx, "test-span")
+			span.Finish()
+
+			suite.NoError(response.String(http.StatusNoContent, ""))
+		}).Name("test-route")
+	}, func() {
+		result, err := suite.Get("/test", nil)
+
+		if !suite.NoError(err) {
+			return
+		}
+		suite.Equal(http.StatusNoContent, result.StatusCode)
+
+		spans := mt.FinishedSpans()
+		if !suite.Len(spans, 2) {
+			return
+		}
+
+		{
+			span := spans[0]
+			suite.Equal("test-span", span.OperationName())
+			suite.NotZero(span.ParentID())
+		}
+
+		{
+			span := spans[1]
+			suite.Equal("web.request", span.OperationName())
+			suite.Equal("goyave.dev/goyave", span.Tag(ext.Component))
+			suite.Equal("service-name", span.Tag(ext.ServiceName))
+			suite.Equal("test", span.Tag(ext.Environment))
+			suite.Equal(ext.SpanTypeWeb, span.Tag(ext.SpanType))
+			suite.Equal(ext.SpanKindServer, span.Tag(ext.SpanKind))
+			suite.Equal("/test", span.Tag(ext.HTTPURL))
+			suite.Equal(http.MethodGet, span.Tag(ext.HTTPMethod))
+			suite.Equal("test-route", span.Tag(ext.HTTPRoute))
+		}
+	})
+}
+
 func TestWriterSuite(t *testing.T) {
 	err := config.LoadJSON(`{"app": {"environment": "test", "datadog": {"service": "service-name"}}}`)
 	if !assert.NoError(t, err) {