mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-03-29 21:02:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move auth-basic service to service tracer.

Browse Source 
This changes the auth-basic service away from using global tracers,
which makes debugging tracing issues easier going forward.
This commit is contained in:
Daniël Franke
2023-07-06 12:00:39 +02:00
parent 138754749a
commit fc58f86602
5 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/auth-basic/pkg/command/server.go
View File

@@ -13,13 +13,13 @@ import (
"github.com/owncloud/ocis/v2/ocis-pkg/ldap"
"github.com/owncloud/ocis/v2/ocis-pkg/registry"
"github.com/owncloud/ocis/v2/ocis-pkg/sync"
"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/owncloud/ocis/v2/services/auth-basic/pkg/config"
"github.com/owncloud/ocis/v2/services/auth-basic/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/auth-basic/pkg/logging"
"github.com/owncloud/ocis/v2/services/auth-basic/pkg/revaconfig"
"github.com/owncloud/ocis/v2/services/auth-basic/pkg/server/debug"
"github.com/owncloud/ocis/v2/services/auth-basic/pkg/tracing"
"github.com/urfave/cli/v2"
)
@@ -34,7 +34,7 @@ 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, logger)
traceProvider, err := tracing.GetServiceTraceProvider(cfg.Tracing, cfg.Service.Name)
if err != nil {
return err
}
@@ -63,6 +63,7 @@ func Server(cfg *config.Config) *cli.Command {
runtime.RunWithOptions(rCfg, pidFile,
runtime.WithLogger(&logger.Logger),
runtime.WithRegistry(reg),
runtime.WithTraceProvider(traceProvider),
)
return nil
@@ -80,7 +81,6 @@ func Server(cfg *config.Config) *cli.Command {
debug.Context(ctx),
debug.Config(cfg),
)
if err != nil {
logger.Info().Err(err).Str("server", "debug").Msg("Failed to initialize server")
return err