Add missing tracing references to multiple services. (#7110)

This commit is contained in:
Daniel Swärd
2023-08-23 15:17:17 +02:00
committed by GitHub
parent 55127fe413
commit 49fc22d532
28 changed files with 162 additions and 83 deletions
+7 -3
View File
@@ -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) {