From 162b04f8731a980b8f5ae0c51144d0ae06a317bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Franke?= Date: Wed, 26 Jul 2023 11:35:01 +0200 Subject: [PATCH] Add dummy provider if none is set --- ocis-pkg/service/grpc/client.go | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ocis-pkg/service/grpc/client.go b/ocis-pkg/service/grpc/client.go index d3c4090089..79a7ddbb00 100644 --- a/ocis-pkg/service/grpc/client.go +++ b/ocis-pkg/service/grpc/client.go @@ -48,7 +48,10 @@ func WithTLSCACert(v string) ClientOption { // WithTraceProvider allows to set the trace Provider for grpc clients func WithTraceProvider(tp trace.TracerProvider) ClientOption { return func(o *ClientOptions) { - o.tp = tp + if tp != nil { + o.tp = tp + } + o.tp = trace.NewNoopTracerProvider() } } @@ -92,8 +95,8 @@ func Configure(opts ...ClientOption) error { tlsConfig.RootCAs = certs } cOpts = append(cOpts, mgrpcc.AuthTLS(tlsConfig)) - //case "off": - //default: + // case "off": + // default: } defaultClient = mgrpcc.NewClient(cOpts...) @@ -150,8 +153,8 @@ func NewClient(opts ...ClientOption) (client.Client, error) { tlsConfig.RootCAs = certs } cOpts = append(cOpts, mgrpcc.AuthTLS(tlsConfig)) - //case "off": - //default: + // case "off": + // default: } return mgrpcc.NewClient(cOpts...), nil