Only init DefaultTracerProvider if tracing is enabled (#2978)

Stay with NOOP provider otherwise
cs3org · Jun 16, 2022 · dffcaf7 · dffcaf7
1 parent f7b1b5f
commit dffcaf7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog/unreleased/per-service-trace.md b/changelog/unreleased/per-service-trace.md
@@ -5,3 +5,4 @@ This is especially helpful when running multiple reva services in a single
 process (like e.g. oCIS does).
 
 https://github.com/cs3org/reva/pull/2962
+https://github.com/cs3org/reva/pull/2978
diff --git a/cmd/revad/runtime/runtime.go b/cmd/revad/runtime/runtime.go
@@ -148,7 +148,9 @@ func initServers(mainConf map[string]interface{}, log *zerolog.Logger, tp trace.
 }
 
 func initTracing(conf *coreConf) trace.TracerProvider {
-	rtrace.InitDefaultTracerProvider(conf.TracingCollector, conf.TracingEndpoint)
+	if conf.TracingEnabled {
+		rtrace.InitDefaultTracerProvider(conf.TracingCollector, conf.TracingEndpoint)
+	}
 	return rtrace.GetTracerProvider(conf.TracingEnabled, conf.TracingCollector, conf.TracingEndpoint, conf.TracingServiceName)
 }