fix: replace hardcoded services names for variables

jvillafanez · jvillafanez · commit 8b8c7f02bfb2 · 2025-08-05T10:00:24.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func Server(opts ...Option) (http.Service, error) {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`middlewares := []func(stdhttp.Handler) stdhttp.Handler{`
`45`		`- middleware.GetOtelhttpMiddleware("activitylog", options.TraceProvider),`
	`45`	`+ middleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TraceProvider),`
`46`	`46`	`chimiddleware.RequestID,`
`47`	`47`	`middleware.Version(`
`48`	`48`	`options.Config.Service.Name,`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func Server(opts ...Option) (http.Service, error) {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`middlewares := []func(stdhttp.Handler) stdhttp.Handler{`
`68`		`- middleware.GetOtelhttpMiddleware("graph", options.TraceProvider),`
	`68`	`+ middleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TraceProvider),`
`69`	`69`	`chimiddleware.RequestID,`
`70`	`70`	`middleware.Version(`
`71`	`71`	`options.Config.Service.Name,`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func Server(opts ...Option) (http.Service, error) {`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`middlewares := []func(stdhttp.Handler) stdhttp.Handler{`
`46`		`- middleware.GetOtelhttpMiddleware("sse", options.TracerProvider),`
	`46`	`+ middleware.GetOtelhttpMiddleware(options.Config.Service.Name, options.TracerProvider),`
`47`	`47`	`chimiddleware.RequestID,`
`48`	`48`	`middleware.Version(`
`49`	`49`	`options.Config.Service.Name,`