mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2026-01-06 12:19:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Convert web to service trace provider.

Browse Source 
This converts the web service to use the service trace provider.
This commit is contained in:
Daniël Franke
2023-08-03 10:38:13 +02:00
parent db098fa4f5
commit 9203478605
8 changed files with 52 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/web/pkg/command/server.go
View File

@@ -8,13 +8,13 @@ import (
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/services/web/pkg/config"
"github.com/owncloud/ocis/v2/services/web/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/web/pkg/logging"
"github.com/owncloud/ocis/v2/services/web/pkg/metrics"
"github.com/owncloud/ocis/v2/services/web/pkg/server/debug"
"github.com/owncloud/ocis/v2/services/web/pkg/server/http"
"github.com/owncloud/ocis/v2/services/web/pkg/tracing"
"github.com/urfave/cli/v2"
)
@@ -29,7 +29,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)
traceProvider, err := tracing.GetServiceTraceProvider(cfg.Tracing, cfg.Service.Name)
if err != nil {
return err
}
@@ -67,8 +67,8 @@ func Server(cfg *config.Config) *cli.Command {
http.Namespace(cfg.HTTP.Namespace),
http.Config(cfg),
http.Metrics(metrics),
http.TraceProvider(traceProvider),
)
if err != nil {
logger.Info().
Err(err).
@@ -102,7 +102,6 @@ func Server(cfg *config.Config) *cli.Command {
debug.Context(ctx),
debug.Config(cfg),
)
if err != nil {
logger.Info().Err(err).Str("transport", "debug").Msg("Failed to initialize server")
return err