From 49fc22d53223a6fa022e4358c452e65f40e38b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sw=C3=A4rd?= Date: Wed, 23 Aug 2023 15:17:17 +0200 Subject: [PATCH] Add missing tracing references to multiple services. (#7110) --- .../eventhistory/pkg/server/grpc/server.go | 1 + services/graph/pkg/server/http/server.go | 8 +++++- services/graph/pkg/service/v0/service.go | 6 +++- services/ocdav/pkg/command/server.go | 1 + services/proxy/pkg/command/server.go | 8 +++++- services/search/pkg/server/grpc/server.go | 1 + services/search/pkg/service/grpc/v0/option.go | 15 ++++++++-- .../search/pkg/service/grpc/v0/service.go | 2 +- services/storage-users/pkg/command/server.go | 2 +- services/store/pkg/command/server.go | 10 +++++-- services/store/pkg/config/tracing.go | 12 ++++++++ services/store/pkg/server/grpc/option.go | 25 +++++++++++++---- services/store/pkg/server/grpc/server.go | 1 + services/store/pkg/tracing/tracing.go | 23 --------------- services/thumbnails/pkg/command/server.go | 1 + services/thumbnails/pkg/server/grpc/server.go | 1 + services/thumbnails/pkg/server/http/option.go | 25 +++++++++++++---- services/thumbnails/pkg/server/http/server.go | 2 +- .../thumbnails/pkg/service/http/v0/option.go | 13 +++++++++ .../thumbnails/pkg/service/http/v0/service.go | 11 ++++++++ .../thumbnails/pkg/service/http/v0/tracing.go | 28 ------------------- services/userlog/pkg/server/http/server.go | 1 + services/web/pkg/server/http/server.go | 7 ++++- services/webdav/pkg/server/http/server.go | 1 + services/webdav/pkg/service/v0/service.go | 1 + services/webfinger/pkg/command/server.go | 1 + services/webfinger/pkg/server/http/option.go | 27 +++++++++++++----- services/webfinger/pkg/server/http/server.go | 11 ++++++++ 28 files changed, 162 insertions(+), 83 deletions(-) delete mode 100644 services/store/pkg/tracing/tracing.go delete mode 100644 services/thumbnails/pkg/service/http/v0/tracing.go diff --git a/services/eventhistory/pkg/server/grpc/server.go b/services/eventhistory/pkg/server/grpc/server.go index 033eb1dc2..d54a97cfc 100644 --- a/services/eventhistory/pkg/server/grpc/server.go +++ b/services/eventhistory/pkg/server/grpc/server.go @@ -26,6 +26,7 @@ func NewService(opts ...Option) grpc.Service { grpc.Context(options.Context), grpc.Flags(options.Flags...), grpc.Version(version.GetString()), + grpc.TraceProvider(options.TraceProvider), ) if err != nil { options.Logger.Fatal().Err(err).Msg("Error creating event history service") diff --git a/services/graph/pkg/server/http/server.go b/services/graph/pkg/server/http/server.go index ddf860356..027599665 100644 --- a/services/graph/pkg/server/http/server.go +++ b/services/graph/pkg/server/http/server.go @@ -95,7 +95,13 @@ func Server(opts ...Option) (http.Service, error) { account.JWTSecret(options.Config.TokenManager.JWTSecret), )) roleService = settingssvc.NewRoleService("com.owncloud.api.settings", grpcClient) - gatewaySelector, err = pool.GatewaySelector(options.Config.Reva.Address, append(options.Config.Reva.GetRevaOptions(), pool.WithRegistry(registry.GetRegistry()))...) + gatewaySelector, err = pool.GatewaySelector( + options.Config.Reva.Address, + append( + options.Config.Reva.GetRevaOptions(), + pool.WithRegistry(registry.GetRegistry()), + pool.WithTracerProvider(options.TraceProvider), + )...) if err != nil { return http.Service{}, errors.Wrap(err, "could not initialize gateway selector") } diff --git a/services/graph/pkg/service/v0/service.go b/services/graph/pkg/service/v0/service.go index 98a397847..e47c562e8 100644 --- a/services/graph/pkg/service/v0/service.go +++ b/services/graph/pkg/service/v0/service.go @@ -320,7 +320,11 @@ func setIdentityBackends(options Options, svc *Graph) error { case "cs3": gatewaySelector, err := pool.GatewaySelector( options.Config.Reva.Address, - append(options.Config.Reva.GetRevaOptions(), pool.WithRegistry(registry.GetRegistry()))..., + append( + options.Config.Reva.GetRevaOptions(), + pool.WithRegistry(registry.GetRegistry()), + pool.WithTracerProvider(options.TraceProvider), + )..., ) if err != nil { return err diff --git a/services/ocdav/pkg/command/server.go b/services/ocdav/pkg/command/server.go index edd27c1d4..a5a8d178c 100644 --- a/services/ocdav/pkg/command/server.go +++ b/services/ocdav/pkg/command/server.go @@ -83,6 +83,7 @@ func Server(cfg *config.Config) *cli.Command { // ocdav.TLSConfig() // tls config for the http server ocdav.MetricsEnabled(true), ocdav.MetricsNamespace("ocis"), + ocdav.Tracing("Adding these strings is a workaround for ->", "https://github.com/cs3org/reva/issues/4131"), ocdav.WithTraceProvider(tracingProvider), } diff --git a/services/proxy/pkg/command/server.go b/services/proxy/pkg/command/server.go index 9411d847c..3a5f0c8ea 100644 --- a/services/proxy/pkg/command/server.go +++ b/services/proxy/pkg/command/server.go @@ -272,7 +272,13 @@ func (h *StaticRouteHandler) backchannelLogout(w http.ResponseWriter, r *http.Re func loadMiddlewares(ctx context.Context, logger log.Logger, cfg *config.Config, userInfoCache microstore.Store, traceProvider trace.TracerProvider) alice.Chain { rolesClient := settingssvc.NewRoleService("com.owncloud.api.settings", cfg.GrpcClient) policiesProviderClient := policiessvc.NewPoliciesProviderService("com.owncloud.api.policies", cfg.GrpcClient) - gatewaySelector, err := pool.GatewaySelector(cfg.Reva.Address, append(cfg.Reva.GetRevaOptions(), pool.WithRegistry(registry.GetRegistry()))...) + gatewaySelector, err := pool.GatewaySelector( + cfg.Reva.Address, + append( + cfg.Reva.GetRevaOptions(), + pool.WithRegistry(registry.GetRegistry()), + pool.WithTracerProvider(traceProvider), + )...) if err != nil { logger.Fatal().Err(err).Msg("Failed to get gateway selector") } diff --git a/services/search/pkg/server/grpc/server.go b/services/search/pkg/server/grpc/server.go index c193da94f..4b686cb4b 100644 --- a/services/search/pkg/server/grpc/server.go +++ b/services/search/pkg/server/grpc/server.go @@ -36,6 +36,7 @@ func Server(opts ...Option) (grpc.Service, func(), error) { svc.Config(options.Config), svc.Logger(options.Logger), svc.JWTSecret(options.JWTSecret), + svc.TracerProvider(options.TraceProvider), ) if err != nil { options.Logger.Error(). diff --git a/services/search/pkg/service/grpc/v0/option.go b/services/search/pkg/service/grpc/v0/option.go index 72014b8e4..f2ed223b6 100644 --- a/services/search/pkg/service/grpc/v0/option.go +++ b/services/search/pkg/service/grpc/v0/option.go @@ -3,6 +3,7 @@ package service import ( "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/search/pkg/config" + "go.opentelemetry.io/otel/trace" ) // Option defines a single option function. @@ -10,9 +11,10 @@ type Option func(o *Options) // Options defines the available options for this package. type Options struct { - Logger log.Logger - Config *config.Config - JWTSecret string + Logger log.Logger + Config *config.Config + JWTSecret string + TracerProvider trace.TracerProvider } func newOptions(opts ...Option) Options { @@ -45,3 +47,10 @@ func JWTSecret(val string) Option { o.JWTSecret = val } } + +// TracerProvider provides a function to set the TracerProvider option +func TracerProvider(val trace.TracerProvider) Option { + return func(o *Options) { + o.TracerProvider = val + } +} diff --git a/services/search/pkg/service/grpc/v0/service.go b/services/search/pkg/service/grpc/v0/service.go index a3e4cda1d..eea985968 100644 --- a/services/search/pkg/service/grpc/v0/service.go +++ b/services/search/pkg/service/grpc/v0/service.go @@ -53,7 +53,7 @@ func NewHandler(opts ...Option) (searchsvc.SearchProviderHandler, func(), error) } // initialize gateway - selector, err := pool.GatewaySelector(cfg.Reva.Address, pool.WithRegistry(registry.GetRegistry())) + selector, err := pool.GatewaySelector(cfg.Reva.Address, pool.WithRegistry(registry.GetRegistry()), pool.WithTracerProvider(options.TracerProvider)) if err != nil { logger.Fatal().Err(err).Msg("could not get reva gateway selector") return nil, teardown, err diff --git a/services/storage-users/pkg/command/server.go b/services/storage-users/pkg/command/server.go index 4f544ce12..e6acbd6f4 100644 --- a/services/storage-users/pkg/command/server.go +++ b/services/storage-users/pkg/command/server.go @@ -94,7 +94,7 @@ func Server(cfg *config.Config) *cli.Command { logger.Fatal().Err(err).Msg("can't connect to nats") } - selector, err := pool.GatewaySelector(cfg.Reva.Address, pool.WithRegistry(registry.GetRegistry())) + selector, err := pool.GatewaySelector(cfg.Reva.Address, pool.WithRegistry(registry.GetRegistry()), pool.WithTracerProvider(traceProvider)) if err != nil { return err } diff --git a/services/store/pkg/command/server.go b/services/store/pkg/command/server.go index f02765a6b..3d7660347 100644 --- a/services/store/pkg/command/server.go +++ b/services/store/pkg/command/server.go @@ -8,6 +8,7 @@ import ( "github.com/owncloud/ocis/v2/ocis-pkg/config/configlog" ogrpc "github.com/owncloud/ocis/v2/ocis-pkg/service/grpc" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "github.com/owncloud/ocis/v2/ocis-pkg/version" "github.com/owncloud/ocis/v2/services/store/pkg/config" "github.com/owncloud/ocis/v2/services/store/pkg/config/parser" @@ -15,7 +16,6 @@ import ( "github.com/owncloud/ocis/v2/services/store/pkg/metrics" "github.com/owncloud/ocis/v2/services/store/pkg/server/debug" "github.com/owncloud/ocis/v2/services/store/pkg/server/grpc" - "github.com/owncloud/ocis/v2/services/store/pkg/tracing" "github.com/urfave/cli/v2" ) @@ -30,12 +30,15 @@ func Server(cfg *config.Config) *cli.Command { }, Action: func(c *cli.Context) error { logger := logging.Configure(cfg.Service.Name, cfg.Log) - err := tracing.Configure(cfg) + traceProvider, err := tracing.GetServiceTraceProvider(cfg.Tracing, cfg.Service.Name) + if err != nil { + return err + } if err != nil { return err } cfg.GrpcClient, err = ogrpc.NewClient( - ogrpc.GetClientOptions(cfg.GRPCClientTLS)..., + append(ogrpc.GetClientOptions(cfg.GRPCClientTLS), ogrpc.WithTraceProvider(traceProvider))..., ) if err != nil { return err @@ -62,6 +65,7 @@ func Server(cfg *config.Config) *cli.Command { grpc.Context(ctx), grpc.Config(cfg), grpc.Metrics(metrics), + grpc.TraceProvider(traceProvider), ) gr.Add(server.Run, func(err error) { diff --git a/services/store/pkg/config/tracing.go b/services/store/pkg/config/tracing.go index 28f7bd327..c0319f3af 100644 --- a/services/store/pkg/config/tracing.go +++ b/services/store/pkg/config/tracing.go @@ -1,5 +1,7 @@ package config +import "github.com/owncloud/ocis/v2/ocis-pkg/tracing" + // Tracing defines the available tracing configuration. type Tracing struct { Enabled bool `yaml:"enabled" env:"OCIS_TRACING_ENABLED;STORE_TRACING_ENABLED" desc:"Activates tracing."` @@ -7,3 +9,13 @@ type Tracing struct { Endpoint string `yaml:"endpoint" env:"OCIS_TRACING_ENDPOINT;STORE_TRACING_ENDPOINT" desc:"The endpoint of the tracing agent."` Collector string `yaml:"collector" env:"OCIS_TRACING_COLLECTOR;STORE_TRACING_COLLECTOR" desc:"The HTTP endpoint for sending spans directly to a collector, i.e. http://jaeger-collector:14268/api/traces. Only used if the tracing endpoint is unset."` } + +// Convert Tracing to the tracing package's Config struct. +func (t Tracing) Convert() tracing.Config { + return tracing.Config{ + Enabled: t.Enabled, + Type: t.Type, + Endpoint: t.Endpoint, + Collector: t.Collector, + } +} diff --git a/services/store/pkg/server/grpc/option.go b/services/store/pkg/server/grpc/option.go index dc8e16843..4c72f473c 100644 --- a/services/store/pkg/server/grpc/option.go +++ b/services/store/pkg/server/grpc/option.go @@ -7,6 +7,7 @@ import ( "github.com/owncloud/ocis/v2/services/store/pkg/config" "github.com/owncloud/ocis/v2/services/store/pkg/metrics" "github.com/urfave/cli/v2" + "go.opentelemetry.io/otel/trace" ) // Option defines a single option function. @@ -14,12 +15,13 @@ type Option func(o *Options) // Options defines the available options for this package. type Options struct { - Name string - Logger log.Logger - Context context.Context - Config *config.Config - Metrics *metrics.Metrics - Flags []cli.Flag + Name string + Logger log.Logger + Context context.Context + Config *config.Config + Metrics *metrics.Metrics + Flags []cli.Flag + TraceProvider trace.TracerProvider } // newOptions initializes the available default options. @@ -74,3 +76,14 @@ func Flags(val []cli.Flag) Option { o.Flags = append(o.Flags, val...) } } + +// TraceProvider provides a function to configure the trace provider +func TraceProvider(traceProvider trace.TracerProvider) Option { + return func(o *Options) { + if traceProvider != nil { + o.TraceProvider = traceProvider + } else { + o.TraceProvider = trace.NewNoopTracerProvider() + } + } +} diff --git a/services/store/pkg/server/grpc/server.go b/services/store/pkg/server/grpc/server.go index 8e9c037fc..3826eb694 100644 --- a/services/store/pkg/server/grpc/server.go +++ b/services/store/pkg/server/grpc/server.go @@ -25,6 +25,7 @@ func Server(opts ...Option) grpc.Service { grpc.Address(options.Config.GRPC.Addr), grpc.Logger(options.Logger), grpc.Flags(options.Flags...), + grpc.TraceProvider(options.TraceProvider), ) if err != nil { options.Logger.Fatal().Err(err).Msg("Error creating store service") diff --git a/services/store/pkg/tracing/tracing.go b/services/store/pkg/tracing/tracing.go deleted file mode 100644 index 6e6e70526..000000000 --- a/services/store/pkg/tracing/tracing.go +++ /dev/null @@ -1,23 +0,0 @@ -package tracing - -import ( - pkgtrace "github.com/owncloud/ocis/v2/ocis-pkg/tracing" - "github.com/owncloud/ocis/v2/services/store/pkg/config" - "go.opentelemetry.io/otel/trace" -) - -var ( - // TraceProvider is the global trace provider for the store service. - TraceProvider = trace.NewNoopTracerProvider() -) - -func Configure(cfg *config.Config) error { - var err error - if cfg.Tracing.Enabled { - if TraceProvider, err = pkgtrace.GetTraceProvider(cfg.Tracing.Endpoint, cfg.Tracing.Collector, cfg.Service.Name, cfg.Tracing.Type); err != nil { - return err - } - } - - return nil -} diff --git a/services/thumbnails/pkg/command/server.go b/services/thumbnails/pkg/command/server.go index 6e32f7fbe..a18b49e3b 100644 --- a/services/thumbnails/pkg/command/server.go +++ b/services/thumbnails/pkg/command/server.go @@ -95,6 +95,7 @@ func Server(cfg *config.Config) *cli.Command { http.Config(cfg), http.Metrics(metrics), http.Namespace(cfg.HTTP.Namespace), + http.TraceProvider(traceProvider), ) if err != nil { logger.Info(). diff --git a/services/thumbnails/pkg/server/grpc/server.go b/services/thumbnails/pkg/server/grpc/server.go index 270cd994c..39f099e14 100644 --- a/services/thumbnails/pkg/server/grpc/server.go +++ b/services/thumbnails/pkg/server/grpc/server.go @@ -49,6 +49,7 @@ func NewService(opts ...Option) grpc.Service { pool.WithTLSCACert(options.Config.GRPCClientTLS.CACert), pool.WithTLSMode(tm), pool.WithRegistry(registry.GetRegistry()), + pool.WithTracerProvider(options.TraceProvider), ) if err != nil { options.Logger.Error().Err(err).Msg("could not get gateway selector") diff --git a/services/thumbnails/pkg/server/http/option.go b/services/thumbnails/pkg/server/http/option.go index 6cb7020ee..b77014b15 100644 --- a/services/thumbnails/pkg/server/http/option.go +++ b/services/thumbnails/pkg/server/http/option.go @@ -7,6 +7,7 @@ import ( "github.com/owncloud/ocis/v2/services/thumbnails/pkg/config" "github.com/owncloud/ocis/v2/services/thumbnails/pkg/metrics" "github.com/urfave/cli/v2" + "go.opentelemetry.io/otel/trace" ) // Option defines a single option function. @@ -14,12 +15,13 @@ type Option func(o *Options) // Options defines the available options for this package. type Options struct { - Namespace string - Logger log.Logger - Context context.Context - Config *config.Config - Metrics *metrics.Metrics - Flags []cli.Flag + Namespace string + Logger log.Logger + Context context.Context + Config *config.Config + Metrics *metrics.Metrics + Flags []cli.Flag + TraceProvider trace.TracerProvider } // newOptions initializes the available default options. @@ -67,3 +69,14 @@ func Namespace(val string) Option { o.Namespace = val } } + +// TraceProvider provides a function to configure the trace provider +func TraceProvider(traceProvider trace.TracerProvider) Option { + return func(o *Options) { + if traceProvider != nil { + o.TraceProvider = traceProvider + } else { + o.TraceProvider = trace.NewNoopTracerProvider() + } + } +} diff --git a/services/thumbnails/pkg/server/http/server.go b/services/thumbnails/pkg/server/http/server.go index 4401ac681..7dfa8adb1 100644 --- a/services/thumbnails/pkg/server/http/server.go +++ b/services/thumbnails/pkg/server/http/server.go @@ -24,6 +24,7 @@ func Server(opts ...Option) (http.Service, error) { http.Namespace(options.Config.HTTP.Namespace), http.Address(options.Config.HTTP.Addr), http.Context(options.Context), + http.TraceProvider(options.TraceProvider), ) if err != nil { options.Logger.Error(). @@ -56,7 +57,6 @@ func Server(opts ...Option) (http.Service, error) { { handle = svc.NewInstrument(handle, options.Metrics) handle = svc.NewLogging(handle, options.Logger) - handle = svc.NewTracing(handle) } if err := micro.RegisterHandler(service.Server(), handle); err != nil { diff --git a/services/thumbnails/pkg/service/http/v0/option.go b/services/thumbnails/pkg/service/http/v0/option.go index 13f2f52a7..aa630843e 100644 --- a/services/thumbnails/pkg/service/http/v0/option.go +++ b/services/thumbnails/pkg/service/http/v0/option.go @@ -6,6 +6,7 @@ import ( "github.com/owncloud/ocis/v2/ocis-pkg/log" "github.com/owncloud/ocis/v2/services/thumbnails/pkg/config" "github.com/owncloud/ocis/v2/services/thumbnails/pkg/thumbnail/storage" + "go.opentelemetry.io/otel/trace" ) // Option defines a single option function. @@ -17,6 +18,7 @@ type Options struct { Config *config.Config Middleware []func(http.Handler) http.Handler ThumbnailStorage storage.Storage + TraceProvider trace.TracerProvider } // newOptions initializes the available default options. @@ -57,3 +59,14 @@ func ThumbnailStorage(storage storage.Storage) Option { o.ThumbnailStorage = storage } } + +// TraceProvider provides a function to configure the trace provider +func TraceProvider(traceProvider trace.TracerProvider) Option { + return func(o *Options) { + if traceProvider != nil { + o.TraceProvider = traceProvider + } else { + o.TraceProvider = trace.NewNoopTracerProvider() + } + } +} diff --git a/services/thumbnails/pkg/service/http/v0/service.go b/services/thumbnails/pkg/service/http/v0/service.go index 1fe63be6e..8e36a3727 100644 --- a/services/thumbnails/pkg/service/http/v0/service.go +++ b/services/thumbnails/pkg/service/http/v0/service.go @@ -8,8 +8,10 @@ import ( "github.com/go-chi/chi/v5" "github.com/golang-jwt/jwt/v4" + "github.com/riandyrn/otelchi" "github.com/owncloud/ocis/v2/ocis-pkg/log" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "github.com/owncloud/ocis/v2/services/thumbnails/pkg/config" tjwt "github.com/owncloud/ocis/v2/services/thumbnails/pkg/service/jwt" "github.com/owncloud/ocis/v2/services/thumbnails/pkg/thumbnail" @@ -34,6 +36,15 @@ func NewService(opts ...Option) Service { m := chi.NewMux() m.Use(options.Middleware...) + m.Use( + otelchi.Middleware( + "thumbnails", + otelchi.WithChiRoutes(m), + otelchi.WithTracerProvider(options.TraceProvider), + otelchi.WithPropagators(tracing.GetPropagator()), + ), + ) + logger := options.Logger resolutions, err := thumbnail.ParseResolutions(options.Config.Thumbnail.Resolutions) if err != nil { diff --git a/services/thumbnails/pkg/service/http/v0/tracing.go b/services/thumbnails/pkg/service/http/v0/tracing.go deleted file mode 100644 index 94acf496a..000000000 --- a/services/thumbnails/pkg/service/http/v0/tracing.go +++ /dev/null @@ -1,28 +0,0 @@ -package svc - -import ( - "net/http" - - "github.com/owncloud/ocis/v2/ocis-pkg/middleware" -) - -// NewTracing returns a service that instruments traces. -func NewTracing(next Service) Service { - return tracing{ - next: next, - } -} - -type tracing struct { - next Service -} - -// ServeHTTP implements the Service interface. -func (t tracing) ServeHTTP(w http.ResponseWriter, r *http.Request) { - middleware.TraceContext(t.next).ServeHTTP(w, r) -} - -// GetThumbnail implements the Service interface. -func (t tracing) GetThumbnail(w http.ResponseWriter, r *http.Request) { - t.next.GetThumbnail(w, r) -} diff --git a/services/userlog/pkg/server/http/server.go b/services/userlog/pkg/server/http/server.go index bb051ffbc..6c6286089 100644 --- a/services/userlog/pkg/server/http/server.go +++ b/services/userlog/pkg/server/http/server.go @@ -35,6 +35,7 @@ func Server(opts ...Option) (http.Service, error) { http.Address(options.Config.HTTP.Addr), http.Context(options.Context), http.Flags(options.Flags...), + http.TraceProvider(options.TracerProvider), ) if err != nil { options.Logger.Error(). diff --git a/services/web/pkg/server/http/server.go b/services/web/pkg/server/http/server.go index 1815e5461..80145b8d5 100644 --- a/services/web/pkg/server/http/server.go +++ b/services/web/pkg/server/http/server.go @@ -37,7 +37,11 @@ func Server(opts ...Option) (http.Service, error) { return http.Service{}, fmt.Errorf("could not initialize http service: %w", err) } - gatewaySelector, err := pool.GatewaySelector(options.Config.GatewayAddress, pool.WithRegistry(registry.GetRegistry())) + gatewaySelector, err := pool.GatewaySelector( + options.Config.GatewayAddress, + pool.WithRegistry(registry.GetRegistry()), + pool.WithTracerProvider(options.TraceProvider), + ) if err != nil { return http.Service{}, err } @@ -67,6 +71,7 @@ func Server(opts ...Option) (http.Service, error) { cors.AllowCredentials(options.Config.HTTP.CORS.AllowCredentials), ), ), + svc.TraceProvider(options.TraceProvider), ) { diff --git a/services/webdav/pkg/server/http/server.go b/services/webdav/pkg/server/http/server.go index 77c274353..acb36a057 100644 --- a/services/webdav/pkg/server/http/server.go +++ b/services/webdav/pkg/server/http/server.go @@ -57,6 +57,7 @@ func Server(opts ...Option) (http.Service, error) { options.Logger, ), ), + svc.TraceProvider(options.TraceProvider), ) if err != nil { return http.Service{}, err diff --git a/services/webdav/pkg/service/v0/service.go b/services/webdav/pkg/service/v0/service.go index 73e91dee3..56f4e2513 100644 --- a/services/webdav/pkg/service/v0/service.go +++ b/services/webdav/pkg/service/v0/service.go @@ -78,6 +78,7 @@ func NewService(opts ...Option) (Service, error) { pool.WithTLSCACert(conf.GRPCClientTLS.CACert), pool.WithTLSMode(tm), pool.WithRegistry(registry.GetRegistry()), + pool.WithTracerProvider(options.TraceProvider), ) if err != nil { return nil, err diff --git a/services/webfinger/pkg/command/server.go b/services/webfinger/pkg/command/server.go index 7560b5436..7874e8ff0 100644 --- a/services/webfinger/pkg/command/server.go +++ b/services/webfinger/pkg/command/server.go @@ -75,6 +75,7 @@ func Server(cfg *config.Config) *cli.Command { http.Context(ctx), http.Config(cfg), http.Service(svc), + http.TraceProvider(traceProvider), ) if err != nil { diff --git a/services/webfinger/pkg/server/http/option.go b/services/webfinger/pkg/server/http/option.go index 28ebd40d6..df5d6635b 100644 --- a/services/webfinger/pkg/server/http/option.go +++ b/services/webfinger/pkg/server/http/option.go @@ -7,6 +7,7 @@ import ( "github.com/owncloud/ocis/v2/services/webfinger/pkg/config" svc "github.com/owncloud/ocis/v2/services/webfinger/pkg/service/v0" "github.com/urfave/cli/v2" + "go.opentelemetry.io/otel/trace" ) // Option defines a single option function. @@ -14,13 +15,14 @@ type Option func(o *Options) // Options defines the available options for this package. type Options struct { - Name string - Namespace string - Logger log.Logger - Context context.Context - Config *config.Config - Flags []cli.Flag - Service svc.Service + Name string + Namespace string + Logger log.Logger + Context context.Context + Config *config.Config + Flags []cli.Flag + Service svc.Service + TraceProvider trace.TracerProvider } // newOptions initializes the available default options. @@ -82,3 +84,14 @@ func Service(val svc.Service) Option { o.Service = val } } + +// TraceProvider provides a function to configure the trace provider +func TraceProvider(traceProvider trace.TracerProvider) Option { + return func(o *Options) { + if traceProvider != nil { + o.TraceProvider = traceProvider + } else { + o.TraceProvider = trace.NewNoopTracerProvider() + } + } +} diff --git a/services/webfinger/pkg/server/http/server.go b/services/webfinger/pkg/server/http/server.go index 9f9aece3f..7fe7d1740 100644 --- a/services/webfinger/pkg/server/http/server.go +++ b/services/webfinger/pkg/server/http/server.go @@ -12,10 +12,12 @@ import ( "github.com/owncloud/ocis/v2/ocis-pkg/cors" "github.com/owncloud/ocis/v2/ocis-pkg/middleware" ohttp "github.com/owncloud/ocis/v2/ocis-pkg/service/http" + "github.com/owncloud/ocis/v2/ocis-pkg/tracing" "github.com/owncloud/ocis/v2/ocis-pkg/version" serviceErrors "github.com/owncloud/ocis/v2/services/webfinger/pkg/service/v0" svc "github.com/owncloud/ocis/v2/services/webfinger/pkg/service/v0" "github.com/pkg/errors" + "github.com/riandyrn/otelchi" "go-micro.dev/v4" ) @@ -62,6 +64,15 @@ func Server(opts ...Option) (ohttp.Service, error) { version.String, )) + mux.Use( + otelchi.Middleware( + options.Name, + otelchi.WithChiRoutes(mux), + otelchi.WithTracerProvider(options.TraceProvider), + otelchi.WithPropagators(tracing.GetPropagator()), + ), + ) + var oidcHTTPClient = &http.Client{ Transport: &http.Transport{ TLSClientConfig: &tls.Config{