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.

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

Solve panic due to concurrent access to ExportSpans #3058

Merged
merged 1 commit into from Dec 29, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 16 additions & 6 deletions util/tracing/detect/detect.go
Expand Up @@ -73,21 +73,31 @@ func detectExporter() (sdktrace.SpanExporter, error) {
return nil, nil
}

func detect() error {
tp = trace.NewNoopTracerProvider()

func getExporter() (sdktrace.SpanExporter, error) {
exp, err := detectExporter()
if err != nil {
return err
return nil, err
}

if exp != nil {
exp = &threadSafeExporterWrapper{
exporter: exp,
}
}

if Recorder != nil {
Recorder.SpanExporter = exp
exp = Recorder
}
return exp, nil
}

func detect() error {
tp = trace.NewNoopTracerProvider()

if exp == nil {
return nil
exp, err := getExporter()
if err != nil || exp == nil {
return err
}

// enable log with traceID when valid exporter
Expand Down
26 changes: 26 additions & 0 deletions util/tracing/detect/threadsafe.go
@@ -0,0 +1,26 @@
package detect

import (
"context"
"sync"

sdktrace "go.opentelemetry.io/otel/sdk/trace"
)

// threadSafeExporterWrapper wraps an OpenTelemetry SpanExporter and makes it thread-safe.
type threadSafeExporterWrapper struct {
mu sync.Mutex
exporter sdktrace.SpanExporter
}

func (tse *threadSafeExporterWrapper) ExportSpans(ctx context.Context, spans []sdktrace.ReadOnlySpan) error {
tse.mu.Lock()
defer tse.mu.Unlock()
return tse.exporter.ExportSpans(ctx, spans)
}

func (tse *threadSafeExporterWrapper) Shutdown(ctx context.Context) error {
tse.mu.Lock()
defer tse.mu.Unlock()
return tse.exporter.Shutdown(ctx)
}