contrib/*: fix multiple spanOpts potential append() data race

Signed-off-by: Eliott Bouhana <eliott.bouhana@datadoghq.com>
DataDog · Dec 7, 2023 · 8f24d7b · 8f24d7b
1 parent 3dc6559
commit 8f24d7b
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 11 deletions.
diff --git a/contrib/gin-gonic/gin/gintrace.go b/contrib/gin-gonic/gin/gintrace.go
@@ -44,7 +44,10 @@ func Middleware(service string, opts ...Option) gin.HandlerFunc {
 		if cfg.ignoreRequest(c) {
 			return
 		}
-		opts := append(spanOpts, tracer.ResourceName(cfg.resourceNamer(c)))
+
+		opts := make([]tracer.StartSpanOption, len(spanOpts), len(spanOpts)+4)
+		copy(opts, spanOpts)
+		opts = append(opts, tracer.ResourceName(cfg.resourceNamer(c)))
 		if !math.IsNaN(cfg.analyticsRate) {
 			opts = append(opts, tracer.Tag(ext.EventSampleRate, cfg.analyticsRate))
 		}

diff --git a/contrib/go-chi/chi.v5/chi.go b/contrib/go-chi/chi.v5/chi.go
@@ -8,6 +8,7 @@ package chi // import "gopkg.in/DataDog/dd-trace-go.v1/contrib/go-chi/chi.v5"
 
 import (
 	"fmt"
+	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace"
 	"math"
 	"net/http"
 
@@ -46,10 +47,13 @@ func Middleware(opts ...Option) func(next http.Handler) http.Handler {
 				next.ServeHTTP(w, r)
 				return
 			}
-			opts := spanOpts
+			opts := make([]ddtrace.StartSpanOption, len(spanOpts), len(spanOpts)+2)
+			copy(opts, cfg.spanOpts)
+
 			if !math.IsNaN(cfg.analyticsRate) {
 				opts = append(opts, tracer.Tag(ext.EventSampleRate, cfg.analyticsRate))
 			}
+
 			opts = append(opts, httptrace.HeaderTagsFromRequest(r, cfg.headerTags))
 			span, ctx := httptrace.StartRequestSpan(r, opts...)
 			ww := middleware.NewWrapResponseWriter(w, r.ProtoMajor)

diff --git a/contrib/go-chi/chi/chi.go b/contrib/go-chi/chi/chi.go
@@ -8,6 +8,7 @@ package chi // import "gopkg.in/DataDog/dd-trace-go.v1/contrib/go-chi/chi"
 
 import (
 	"fmt"
+	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace"
 	"math"
 	"net/http"
 
@@ -46,10 +47,13 @@ func Middleware(opts ...Option) func(next http.Handler) http.Handler {
 				next.ServeHTTP(w, r)
 				return
 			}
-			opts := spanOpts
+			opts := make([]ddtrace.StartSpanOption, len(spanOpts), len(spanOpts)+2)
+			copy(opts, cfg.spanOpts)
+
 			if !math.IsNaN(cfg.analyticsRate) {
 				opts = append(opts, tracer.Tag(ext.EventSampleRate, cfg.analyticsRate))
 			}
+
 			opts = append(opts, httptrace.HeaderTagsFromRequest(r, cfg.headerTags))
 			span, ctx := httptrace.StartRequestSpan(r, opts...)
 			ww := middleware.NewWrapResponseWriter(w, r.ProtoMajor)

diff --git a/contrib/google.golang.org/grpc/stats_client.go b/contrib/google.golang.org/grpc/stats_client.go
@@ -9,9 +9,9 @@ import (
 	"context"
 	"net"
 
+	"google.golang.org/grpc/stats"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/ext"
 	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace/tracer"
-	"google.golang.org/grpc/stats"
 )
 
 // NewClientStatsHandler returns a gRPC client stats.Handler to trace RPC calls.

diff --git a/contrib/julienschmidt/httprouter/httprouter.go b/contrib/julienschmidt/httprouter/httprouter.go
@@ -7,6 +7,7 @@
 package httprouter // import "gopkg.in/DataDog/dd-trace-go.v1/contrib/julienschmidt/httprouter"
 
 import (
+	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace"
 	"math"
 	"net/http"
 	"strings"
@@ -61,12 +62,14 @@ func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		route = strings.Replace(route, param.Value, ":"+param.Key, 1)
 	}
 	resource := req.Method + " " + route
-	spanOpts := append(r.config.spanOpts, httptraceinternal.HeaderTagsFromRequest(req, r.config.headerTags))
+	opts := make([]ddtrace.StartSpanOption, len(r.config.spanOpts), len(r.config.spanOpts)+1)
+	copy(opts, r.config.spanOpts)
+	opts = append(opts, httptraceinternal.HeaderTagsFromRequest(req, r.config.headerTags))
 
 	httptrace.TraceAndServe(r.Router, w, req, &httptrace.ServeConfig{
 		Service:  r.config.serviceName,
 		Resource: resource,
-		SpanOpts: spanOpts,
+		SpanOpts: opts,
 		Route:    route,
 	})
 }
diff --git a/contrib/k8s.io/client-go/kubernetes/kubernetes.go b/contrib/k8s.io/client-go/kubernetes/kubernetes.go
@@ -48,7 +48,9 @@ func WrapRoundTripper(rt http.RoundTripper) http.RoundTripper {
 }
 
 func wrapRoundTripperWithOptions(rt http.RoundTripper, opts ...httptrace.RoundTripperOption) http.RoundTripper {
-	opts = append(opts, httptrace.WithBefore(func(req *http.Request, span ddtrace.Span) {
+	newOpts := make([]httptrace.RoundTripperOption, len(opts), len(opts)+1)
+	copy(newOpts, opts)
+	newOpts = append(newOpts, httptrace.WithBefore(func(req *http.Request, span ddtrace.Span) {
 		span.SetTag(ext.ResourceName, RequestToResource(req.Method, req.URL.Path))
 		span.SetTag(ext.Component, componentName)
 		span.SetTag(ext.SpanKind, ext.SpanKindClient)
@@ -62,7 +64,7 @@ func wrapRoundTripperWithOptions(rt http.RoundTripper, opts ...httptrace.RoundTr
 		span.SetTag("kubernetes.audit_id", kubeAuditID)
 	}))
 	log.Debug("contrib/k8s.io/client-go/kubernetes: Wrapping RoundTripper.")
-	return httptrace.WrapRoundTripper(rt, opts...)
+	return httptrace.WrapRoundTripper(rt, newOpts...)
 }
 
 // RequestToResource parses a Kubernetes request and extracts a resource name from it.

diff --git a/contrib/labstack/echo.v4/echotrace.go b/contrib/labstack/echo.v4/echotrace.go
@@ -61,7 +61,9 @@ func Middleware(opts ...Option) echo.MiddlewareFunc {
 			request := c.Request()
 			route := c.Path()
 			resource := request.Method + " " + route
-			opts := append(spanOpts, tracer.ResourceName(resource), tracer.Tag(ext.HTTPRoute, route))
+			opts := make([]ddtrace.StartSpanOption, len(spanOpts), len(spanOpts)+3)
+			copy(opts, spanOpts)
+			opts = append(spanOpts, tracer.ResourceName(resource), tracer.Tag(ext.HTTPRoute, route))
 
 			if !math.IsNaN(cfg.analyticsRate) {
 				opts = append(opts, tracer.Tag(ext.EventSampleRate, cfg.analyticsRate))

diff --git a/contrib/labstack/echo/echotrace.go b/contrib/labstack/echo/echotrace.go
@@ -50,7 +50,9 @@ func Middleware(opts ...Option) echo.MiddlewareFunc {
 		return func(c echo.Context) error {
 			request := c.Request()
 			resource := request.Method + " " + c.Path()
-			opts := append(spanOpts, tracer.ResourceName(resource))
+			opts := make([]ddtrace.StartSpanOption, len(spanOpts), len(spanOpts)+3)
+			copy(opts, spanOpts)
+			opts = append(spanOpts, tracer.ResourceName(resource))
 
 			if !math.IsNaN(cfg.analyticsRate) {
 				opts = append(opts, tracer.Tag(ext.EventSampleRate, cfg.analyticsRate))

diff --git a/contrib/urfave/negroni/negroni.go b/contrib/urfave/negroni/negroni.go
@@ -8,6 +8,7 @@ package negroni
 
 import (
 	"fmt"
+	"gopkg.in/DataDog/dd-trace-go.v1/ddtrace"
 	"math"
 	"net/http"
 
@@ -33,7 +34,9 @@ type DatadogMiddleware struct {
 }
 
 func (m *DatadogMiddleware) ServeHTTP(w http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
-	opts := append(
+	opts := make([]ddtrace.StartSpanOption, len(m.cfg.spanOpts), len(m.cfg.spanOpts)+2)
+	copy(opts, m.cfg.spanOpts)
+	opts = append(
 		m.cfg.spanOpts,
 		tracer.ServiceName(m.cfg.serviceName),
 		tracer.ResourceName(m.cfg.resourceNamer(r)),