Convert search service to use service tracing.

This converts the search service to use the service tracer.
It also initialises the grpc service with a trace provider.
This commit is contained in:
Daniël Franke
2023-07-25 11:22:51 +02:00
parent de550b73a1
commit e2fa2be973
5 changed files with 38 additions and 34 deletions
+8 -3
View File
@@ -7,6 +7,7 @@ import (
"github.com/oklog/run"
"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/search/pkg/config"
"github.com/owncloud/ocis/v2/services/search/pkg/config/parser"
@@ -14,7 +15,6 @@ import (
"github.com/owncloud/ocis/v2/services/search/pkg/metrics"
"github.com/owncloud/ocis/v2/services/search/pkg/server/debug"
"github.com/owncloud/ocis/v2/services/search/pkg/server/grpc"
"github.com/owncloud/ocis/v2/services/search/pkg/tracing"
"github.com/urfave/cli/v2"
)
@@ -29,11 +29,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
}
err = ogrpc.Configure(append(ogrpc.GetClientOptions(cfg.GRPCClientTLS), ogrpc.WithTraceProvider(tracing.TraceProvider))...)
err = ogrpc.Configure(
append(ogrpc.GetClientOptions(cfg.GRPCClientTLS),
ogrpc.WithTraceProvider(traceProvider),
)...,
)
if err != nil {
return err
}
@@ -57,6 +61,7 @@ func Server(cfg *config.Config) *cli.Command {
grpc.Context(ctx),
grpc.Metrics(mtrcs),
grpc.JWTSecret(cfg.TokenManager.JWTSecret),
grpc.TraceProvider(traceProvider),
)
defer teardown()
if err != nil {