Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tracing: Allow trace id to propagate and included in logs even though tracing disabled #1126

Merged
merged 3 commits into from
Oct 24, 2024
Merged

Tracing: Allow trace id to propagate and included in logs even though tracing disabled #1126

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cd0696
Tracing: Allow trace id to propagate and included in logs even though…
marefr Oct 23, 2024
db05d3b
Merge remote-tracking branch 'origin' into fix_trace_id_propagation
marefr Oct 23, 2024
98bfbe8
add tests
marefr Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions backend/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,14 @@ func SetupTracer(pluginID string, tracingOpts tracing.Opts) error {

// Initialize global tracer for plugin developer usage
tracing.InitDefaultTracer(otel.Tracer(pluginID))
} else {
pf, err := tracerprovider.NewTextMapPropagator(string(tracerprovider.PropagatorFormatW3C))
if err != nil {
return fmt.Errorf("new propagator format: %w", err)
}

tp := tracerprovider.NewNoOpTracerProvider()
tracerprovider.InitGlobalTracerProvider(tp, pf)
}

enabled := tracingCfg.isEnabled()
Expand Down
6 changes: 3 additions & 3 deletions internal/tracerprovider/tracerprovider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ func (noopTracerProvider) Shutdown(_ context.Context) error {
return nil
}

// newNoOpTracerProvider returns a new noopTracerProvider.
func newNoOpTracerProvider() TracerProvider {
// NewNoOpTracerProvider returns a new noopTracerProvider.
func NewNoOpTracerProvider() TracerProvider {
return &noopTracerProvider{TracerProvider: noop.NewTracerProvider()}
}

Expand Down Expand Up @@ -74,7 +74,7 @@ func newOtelExporter(address string) (tracesdk.SpanExporter, error) {
// It returns a noopTracerProvider if the address is empty, otherwise it returns a new OpenTelemetry TracerProvider.
func NewTracerProvider(address string, samplerOpts SamplerOptions, opts tracing.Opts) (TracerProvider, error) {
if address == "" {
return newNoOpTracerProvider(), nil
return NewNoOpTracerProvider(), nil
}
exp, err := newOtelExporter(address)
if err != nil {
Expand Down