eliott/ocis
1
0
Fork 0
mirror of https://github.com/owncloud/ocis synced 2026-04-25 17:25:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: replace hardcoded services names for variables

Browse Source
This commit is contained in:
Juan Pablo Villafáñez
2025-08-05 10:00:24 +02:00
parent a30475660b
commit 8b8c7f02bf
13 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/activitylog/pkg/server/http/server.go
View File

@@ -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,

2
services/auth-app/pkg/server/http/server.go
View File

@@ -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,

2
services/graph/pkg/server/http/server.go
View File

@@ -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,

2
services/idp/pkg/server/http/server.go
View File

@@ -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,

2
services/invitations/pkg/server/http/server.go
View File

@@ -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)

2
services/ocs/pkg/server/http/server.go
View File

@@ -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,

2
services/proxy/pkg/command/server.go
View File

@@ -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,

2
services/sse/pkg/server/http/server.go
View File

@@ -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,

2
services/thumbnails/pkg/server/http/server.go
View File

@@ -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(

2
services/userlog/pkg/server/http/server.go
View File

@@ -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,

4
services/web/pkg/server/http/server.go
View File

@@ -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),

2
services/webdav/pkg/server/http/server.go
View File

@@ -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,

2
services/webfinger/pkg/server/http/server.go
View File

@@ -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)