From c76b2e75efcf22d660703ab2bf47b1e2d9480b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Franke?= Date: Wed, 26 Jul 2023 11:47:14 +0200 Subject: [PATCH] Add another NewNoopTracerProvider --- ocis-pkg/service/grpc/client.go | 3 ++- services/eventhistory/pkg/server/grpc/option.go | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ocis-pkg/service/grpc/client.go b/ocis-pkg/service/grpc/client.go index 79a7ddbb0..61690e166 100644 --- a/ocis-pkg/service/grpc/client.go +++ b/ocis-pkg/service/grpc/client.go @@ -50,8 +50,9 @@ func WithTraceProvider(tp trace.TracerProvider) ClientOption { return func(o *ClientOptions) { if tp != nil { o.tp = tp + } else { + o.tp = trace.NewNoopTracerProvider() } - o.tp = trace.NewNoopTracerProvider() } } diff --git a/services/eventhistory/pkg/server/grpc/option.go b/services/eventhistory/pkg/server/grpc/option.go index cfe1f0917..62de8a00f 100644 --- a/services/eventhistory/pkg/server/grpc/option.go +++ b/services/eventhistory/pkg/server/grpc/option.go @@ -114,6 +114,10 @@ func Consumer(consumer events.Consumer) Option { // TraceProvider provides a function to configure the trace provider func TraceProvider(traceProvider trace.TracerProvider) Option { return func(o *Options) { - o.TraceProvider = traceProvider + if traceProvider != nil { + o.TraceProvider = traceProvider + } else { + o.TraceProvider = trace.NewNoopTracerProvider() + } } }