fix init httptreemux

raphaelgavache · raphaelgavache · commit 1e9720d91d7e · 2026-03-13T13:10:13.000-04:00
diff --git a/contrib/dimfeld/httptreemux.v5/httptreemux.go b/contrib/dimfeld/httptreemux.v5/httptreemux.go
@@ -43,6 +43,7 @@ func New(opts ...RouterOption) *Router {
 	cfg.spanOpts = append(cfg.spanOpts, tracer.Measured())
 	cfg.spanOpts = append(cfg.spanOpts, tracer.Tag(ext.SpanKind, ext.SpanKindServer))
 	cfg.spanOpts = append(cfg.spanOpts, tracer.Tag(ext.Component, componentName))
+	cfg.spanOpts = append(cfg.spanOpts, instrumentation.ServiceNameWithSource(cfg.serviceName, cfg.serviceSource))
 	instr.Logger().Debug("contrib/dimfeld/httptreemux.v5: Configuring Router: %#v", cfg)
 	return &Router{httptreemux.New(), cfg}
 }
@@ -51,13 +52,12 @@ func New(opts ...RouterOption) *Router {
 func (r *Router) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	resource := r.config.resourceNamer(r.TreeMux, w, req)
 	route, _ := getRoute(r.TreeMux, w, req)
-	spanOpts := append(r.config.spanOpts, instrumentation.ServiceNameWithSource(r.config.serviceName, r.config.serviceSource))
 	// pass r.TreeMux to avoid a circular reference panic on calling r.ServeHTTP
 	httptrace.TraceAndServe(r.TreeMux, w, req, &httptrace.ServeConfig{
 		Framework: "github.com/dimfeld/httptreemux/v5",
 		Service:   r.config.serviceName,
 		Resource:  resource,
-		SpanOpts:  spanOpts,
+		SpanOpts:  r.config.spanOpts,
 		Route:     route,
 	})
 }
@@ -80,6 +80,7 @@ func NewWithContext(opts ...RouterOption) *ContextRouter {
 	cfg.spanOpts = append(cfg.spanOpts, tracer.Measured())
 	cfg.spanOpts = append(cfg.spanOpts, tracer.Tag(ext.SpanKind, ext.SpanKindServer))
 	cfg.spanOpts = append(cfg.spanOpts, tracer.Tag(ext.Component, componentName))
+	cfg.spanOpts = append(cfg.spanOpts, instrumentation.ServiceNameWithSource(cfg.serviceName, cfg.serviceSource))
 	instr.Logger().Debug("contrib/dimfeld/httptreemux.v5: Configuring ContextRouter: %#v", cfg)
 	return &ContextRouter{httptreemux.NewContextMux(), cfg}
 }
@@ -88,13 +89,12 @@ func NewWithContext(opts ...RouterOption) *ContextRouter {
 func (r *ContextRouter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 	resource := r.config.resourceNamer(r.TreeMux, w, req)
 	route, _ := getRoute(r.TreeMux, w, req)
-	spanOpts := append(r.config.spanOpts, instrumentation.ServiceNameWithSource(r.config.serviceName, r.config.serviceSource))
 	// pass r.TreeMux to avoid a circular reference panic on calling r.ServeHTTP
 	httptrace.TraceAndServe(r.TreeMux, w, req, &httptrace.ServeConfig{
 		Framework: "github.com/dimfeld/httptreemux/v5",
 		Service:   r.config.serviceName,
 		Resource:  resource,
-		SpanOpts:  spanOpts,
+		SpanOpts:  r.config.spanOpts,
 		Route:     route,
 	})
 }
