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

Move auth-machine to use service TraceProvider. (#6742)

Browse Source 
This PR moves the auth-machine service to use the service TraceProvider.
This commit is contained in:
Daniël Franke
2023-07-14 16:12:29 +02:00
committed by GitHub
parent 91b46e32fc
commit 30e96a5cca
5 changed files with 24 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,13 +12,13 @@ import (
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
"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-machine/pkg/config"
"github.com/owncloud/ocis/v2/services/auth-machine/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/auth-machine/pkg/logging"
"github.com/owncloud/ocis/v2/services/auth-machine/pkg/revaconfig"
"github.com/owncloud/ocis/v2/services/auth-machine/pkg/server/debug"
"github.com/owncloud/ocis/v2/services/auth-machine/pkg/tracing"
"github.com/urfave/cli/v2"
)
@@ -33,7 +33,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
}
@@ -50,6 +50,7 @@ func Server(cfg *config.Config) *cli.Command {
runtime.RunWithOptions(rCfg, pidFile,
runtime.WithLogger(&logger.Logger),
runtime.WithRegistry(reg),
runtime.WithTraceProvider(traceProvider),
)
return nil
@@ -67,7 +68,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