sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update sharing and ocdav tracing. (#7014)

Browse Source
This commit is contained in:
Daniel Swärd
2023-08-21 12:27:37 +02:00
committed by GitHub
parent e7aaebf07c
commit f805589e9d
10 changed files with 48 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/ocdav/pkg/command/server.go
+3 -9
View File
@@ -9,12 +9,12 @@ import (
"github.com/oklog/run"
"github.com/owncloud/ocis/v2/ocis-pkg/broker"
"github.com/owncloud/ocis/v2/ocis-pkg/config/configlog"
"github.com/owncloud/ocis/v2/ocis-pkg/tracing"
"github.com/owncloud/ocis/v2/ocis-pkg/version"
"github.com/owncloud/ocis/v2/services/ocdav/pkg/config"
"github.com/owncloud/ocis/v2/services/ocdav/pkg/config/parser"
"github.com/owncloud/ocis/v2/services/ocdav/pkg/logging"
"github.com/owncloud/ocis/v2/services/ocdav/pkg/server/debug"
"github.com/owncloud/ocis/v2/services/ocdav/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, logger)
tracingProvider, err := tracing.GetServiceTraceProvider(cfg.Tracing, cfg.Service.Name)
if err != nil {
return err
}
@@ -83,13 +83,7 @@ func Server(cfg *config.Config) *cli.Command {
// ocdav.TLSConfig() // tls config for the http server
ocdav.MetricsEnabled(true),
ocdav.MetricsNamespace("ocis"),
}
if cfg.Tracing.Enabled {
opts = append(opts,
ocdav.Tracing(cfg.Tracing.Endpoint, cfg.Tracing.Collector),
ocdav.WithTracingExporter(cfg.Tracing.Type),
)
ocdav.WithTraceProvider(tracingProvider),
}
s, err := ocdav.Service(opts...)