diff --git a/services/activitylog/pkg/server/http/server.go b/services/activitylog/pkg/server/http/server.go index 09c7b0015dc..009959f87ad 100644 --- a/services/activitylog/pkg/server/http/server.go +++ b/services/activitylog/pkg/server/http/server.go @@ -42,7 +42,7 @@ func Server(opts ...Option) (http.Service, error) { } middlewares := []func(stdhttp.Handler) stdhttp.Handler{ - middleware.GetOtelhttpMiddleware("activitylog", options.TraceProvider), + middleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TraceProvider), chimiddleware.RequestID, middleware.Version( options.Config.Service.Name, diff --git a/services/auth-app/pkg/server/http/server.go b/services/auth-app/pkg/server/http/server.go index b3f265484e4..32fbc5e4ace 100644 --- a/services/auth-app/pkg/server/http/server.go +++ b/services/auth-app/pkg/server/http/server.go @@ -42,7 +42,7 @@ func Server(opts ...Option) (http.Service, error) { } middlewares := []func(stdhttp.Handler) stdhttp.Handler{ - middleware.GetOtelhttpMiddleware("auth-app", options.TracerProvider), + middleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TracerProvider), chimiddleware.RequestID, middleware.Version( options.Config.Service.Name, diff --git a/services/graph/pkg/server/http/server.go b/services/graph/pkg/server/http/server.go index c01170707dd..cccf83d9420 100644 --- a/services/graph/pkg/server/http/server.go +++ b/services/graph/pkg/server/http/server.go @@ -65,7 +65,7 @@ func Server(opts ...Option) (http.Service, error) { } middlewares := []func(stdhttp.Handler) stdhttp.Handler{ - middleware.GetOtelhttpMiddleware("graph", options.TraceProvider), + middleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TraceProvider), chimiddleware.RequestID, middleware.Version( options.Config.Service.Name, diff --git a/services/idp/pkg/server/http/server.go b/services/idp/pkg/server/http/server.go index e7fa1c403cd..151cc3993a7 100644 --- a/services/idp/pkg/server/http/server.go +++ b/services/idp/pkg/server/http/server.go @@ -57,7 +57,7 @@ func Server(opts ...Option) (http.Service, error) { svc.Logger(options.Logger), svc.Config(options.Config), svc.Middleware( - middleware.GetOtelhttpMiddleware("idp", options.TraceProvider), + middleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TraceProvider), chimiddleware.RealIP, chimiddleware.RequestID, middleware.NoCache, diff --git a/services/invitations/pkg/server/http/server.go b/services/invitations/pkg/server/http/server.go index 98fa48c0b54..5e03fe42674 100644 --- a/services/invitations/pkg/server/http/server.go +++ b/services/invitations/pkg/server/http/server.go @@ -43,7 +43,7 @@ func Server(opts ...Option) (ohttp.Service, error) { mux := chi.NewMux() - mux.Use(middleware.GetOtelhttpMiddleware("invitations", options.TraceProvider)) + mux.Use(middleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TraceProvider)) mux.Use(chimiddleware.RealIP) mux.Use(chimiddleware.RequestID) mux.Use(middleware.NoCache) diff --git a/services/ocs/pkg/server/http/server.go b/services/ocs/pkg/server/http/server.go index e1545182317..6277eb5e4d1 100644 --- a/services/ocs/pkg/server/http/server.go +++ b/services/ocs/pkg/server/http/server.go @@ -49,7 +49,7 @@ func Server(opts ...Option) (http.Service, error) { svc.Logger(options.Logger), svc.Config(options.Config), svc.Middleware( - middleware.GetOtelhttpMiddleware("ocs", options.TraceProvider), + middleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TraceProvider), chimiddleware.RealIP, chimiddleware.RequestID, middleware.NoCache, diff --git a/services/proxy/pkg/command/server.go b/services/proxy/pkg/command/server.go index 4bdf56f711c..b369d20092e 100644 --- a/services/proxy/pkg/command/server.go +++ b/services/proxy/pkg/command/server.go @@ -327,7 +327,7 @@ func loadMiddlewares(logger log.Logger, cfg *config.Config, return alice.New( // first make sure we log all requests and redirect to https if necessary - pkgmiddleware.GetOtelhttpMiddleware("proxy", traceProvider), + pkgmiddleware.GetOtelhttpMiddleware(cfg.Service.Name, traceProvider), middleware.Instrumenter(metrics), chimiddleware.RealIP, chimiddleware.RequestID, diff --git a/services/sse/pkg/server/http/server.go b/services/sse/pkg/server/http/server.go index 79c4651b28a..587418b830c 100644 --- a/services/sse/pkg/server/http/server.go +++ b/services/sse/pkg/server/http/server.go @@ -43,7 +43,7 @@ func Server(opts ...Option) (http.Service, error) { } middlewares := []func(stdhttp.Handler) stdhttp.Handler{ - middleware.GetOtelhttpMiddleware("sse", options.TracerProvider), + middleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TracerProvider), chimiddleware.RequestID, middleware.Version( options.Config.Service.Name, diff --git a/services/thumbnails/pkg/server/http/server.go b/services/thumbnails/pkg/server/http/server.go index 060175c7844..d36b7e349ec 100644 --- a/services/thumbnails/pkg/server/http/server.go +++ b/services/thumbnails/pkg/server/http/server.go @@ -38,7 +38,7 @@ func Server(opts ...Option) (http.Service, error) { svc.Logger(options.Logger), svc.Config(options.Config), svc.Middleware( - ocismiddleware.GetOtelhttpMiddleware("thumbnails", options.TraceProvider), + ocismiddleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TraceProvider), middleware.RealIP, middleware.RequestID, ocismiddleware.Cors( diff --git a/services/userlog/pkg/server/http/server.go b/services/userlog/pkg/server/http/server.go index e13113ea351..d98cadb6176 100644 --- a/services/userlog/pkg/server/http/server.go +++ b/services/userlog/pkg/server/http/server.go @@ -42,7 +42,7 @@ func Server(opts ...Option) (http.Service, error) { } middlewares := []func(stdhttp.Handler) stdhttp.Handler{ - middleware.GetOtelhttpMiddleware("userlog", options.TracerProvider), + middleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TracerProvider), chimiddleware.RequestID, middleware.Version( options.Config.Service.Name, diff --git a/services/web/pkg/server/http/server.go b/services/web/pkg/server/http/server.go index 8ed4a1d3ba1..a4b1323fbc7 100644 --- a/services/web/pkg/server/http/server.go +++ b/services/web/pkg/server/http/server.go @@ -32,7 +32,7 @@ func Server(opts ...Option) (http.Service, error) { http.TLSConfig(options.Config.HTTP.TLS), http.Logger(options.Logger), http.Namespace(options.Namespace), - http.Name("web"), + http.Name(options.Config.Service.Name), http.Version(version.GetString()), http.Address(options.Config.HTTP.Addr), http.Context(options.Context), @@ -96,7 +96,7 @@ func Server(opts ...Option) (http.Service, error) { svc.Config(options.Config), svc.GatewaySelector(gatewaySelector), svc.Middleware( - middleware.GetOtelhttpMiddleware("web", options.TraceProvider), + middleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TraceProvider), chimiddleware.RealIP, chimiddleware.RequestID, chimiddleware.Compress(5), diff --git a/services/webdav/pkg/server/http/server.go b/services/webdav/pkg/server/http/server.go index f90a9019ceb..c00e9f2779f 100644 --- a/services/webdav/pkg/server/http/server.go +++ b/services/webdav/pkg/server/http/server.go @@ -38,7 +38,7 @@ func Server(opts ...Option) (http.Service, error) { svc.Logger(options.Logger), svc.Config(options.Config), svc.Middleware( - middleware.GetOtelhttpMiddleware("webdav", options.TraceProvider), + middleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TraceProvider), chimiddleware.RealIP, chimiddleware.RequestID, middleware.NoCache, diff --git a/services/webfinger/pkg/server/http/server.go b/services/webfinger/pkg/server/http/server.go index f60f88ba451..394cb32db68 100644 --- a/services/webfinger/pkg/server/http/server.go +++ b/services/webfinger/pkg/server/http/server.go @@ -43,7 +43,7 @@ func Server(opts ...Option) (ohttp.Service, error) { mux := chi.NewMux() - mux.Use(middleware.GetOtelhttpMiddleware("webfinger", options.TraceProvider)) + mux.Use(middleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TraceProvider)) mux.Use(chimiddleware.RealIP) mux.Use(chimiddleware.RequestID) mux.Use(middleware.NoCache)