Merge pull request #8017 from aduffeck/fix-empty-traceids

Use a on-sampling instead of noop traceprovider to get proper traceids
owncloud · Dec 19, 2023 · fe20ea2 · fe20ea2
2 parents 06b8e6e + 17e0c92
commit fe20ea2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/changelog/unreleased/fix-empty-traceids.md b/changelog/unreleased/fix-empty-traceids.md
@@ -0,0 +1,5 @@
+Bugfix: Fix empty trace ids
+
+We changed the default tracing to produce non-empty traceids.
+
+https://github.com/owncloud/ocis/pull/8017
diff --git a/ocis-pkg/tracing/tracing.go b/ocis-pkg/tracing/tracing.go
@@ -39,7 +39,13 @@ func GetServiceTraceProvider(c ConfigConverter, serviceName string) (trace.Trace
 	if cfg.Enabled {
 		return GetTraceProvider(cfg.Endpoint, cfg.Collector, serviceName, cfg.Type)
 	}
-	return trace.NewNoopTracerProvider(), nil
+
+	tp := sdktrace.NewTracerProvider(
+		sdktrace.WithSampler(sdktrace.NeverSample()),
+	)
+	rtrace.SetDefaultTracerProvider(tp)
+
+	return tp, nil
 }
 
 // GetPropagator gets a configured propagator.