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

Jump to bottom

fix: lock accesses to encoder in json stdout exporter to prevent crash #2265

Merged
merged 5 commits into from Sep 30, 2021
Merged

fix: lock accesses to encoder in json stdout exporter to prevent crash #2265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
79df6ec
lock accesses to encoder
lizthegrey Sep 28, 2021
2cf58d6
move locking outside loop to avoid deadlock
lizthegrey Sep 28, 2021
86e5e1d
Update CHANGELOG.md
lizthegrey Sep 28, 2021
3af5989
Merge branch 'main' into lizf.fix-json-crash
lizthegrey Sep 28, 2021
1082e33
Merge branch 'main' into lizf.fix-json-crash
lizthegrey Sep 30, 2021
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -8,6 +8,10 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

## [Unreleased]

### Fixed

- json stdout exporter no longer crashes due to concurrency bug. (#2265)

### Changed

- NoopMeterProvider is now private and NewNoopMeterProvider must be used to obtain a noopMeterProvider. (#2237)
Expand Down
3 changes: 3 additions & 0 deletions exporters/stdout/stdouttrace/trace.go
View file
Open in desktop
Expand Up @@ -49,6 +49,7 @@ func New(options ...Option) (*Exporter, error) {
// Exporter is an implementation of trace.SpanSyncer that writes spans to stdout.
type Exporter struct {
encoder *json.Encoder
encoderMu sync.Mutex
timestamps bool

stoppedMu sync.RWMutex
Expand All @@ -70,6 +71,8 @@ func (e *Exporter) ExportSpans(ctx context.Context, spans []trace.ReadOnlySpan)

stubs := tracetest.SpanStubsFromReadOnlySpans(spans)

e.encoderMu.Lock()
defer e.encoderMu.Unlock()
for i := range stubs {
stub := &stubs[i]
// Remove timestamps
Expand Down