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

otelsarama: Fix WrapAsyncProducer race condition #881

Merged
merged 2 commits into from
Jul 15, 2021
Merged

otelsarama: Fix WrapAsyncProducer race condition #881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf0f005
otelsarama: Fix WrapAsyncProducer race condition
pellared Jul 12, 2021
cabb771
Update producer.go
pellared Jul 12, 2021
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
### Fixed

- Fix deadlocks and race conditions in `otelsarama.WrapAsyncProducer`.
The `messaging.message_id` and `messaging.kafka.partition` attributes are now not set if a message was not processed. (#754) (#755)
The `messaging.message_id` and `messaging.kafka.partition` attributes are now not set if a message was not processed. (#754) (#755) (#881)
- Fix `otelsarama.WrapAsyncProducer` so that the messages from the `Errors` channel contain the original `Metadata`. (#754)

## [0.21.0] - 2021-06-18
Expand Down
6 changes: 3 additions & 3 deletions instrumentation/github.com/Shopify/sarama/otelsarama/producer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,10 +168,8 @@ func WrapAsyncProducer(saramaConfig *sarama.Config, p sarama.AsyncProducer, opts
span: span,
}

// Specific metadata with span id
// Remember metadata using span ID as a cache key
msg.Metadata = span.SpanContext().SpanID()

p.Input() <- msg
if saramaConfig.Producer.Return.Successes {
mtx.Lock()
producerMessageContexts[msg.Metadata] = mc
Expand All @@ -182,6 +180,8 @@ func WrapAsyncProducer(saramaConfig *sarama.Config, p sarama.AsyncProducer, opts
// be done.
mc.span.End()
}

p.Input() <- msg
}
}
}()
Expand Down