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

Use a on-sampling instead of noop traceprovider to get proper traceids
This commit is contained in:
Andre Duffeck
2023-12-19 16:04:35 +01:00
committed by GitHub
2 changed files with 12 additions and 1 deletions

View File

@@ -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

View File

@@ -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.