-
Notifications
You must be signed in to change notification settings - Fork 292
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
[EventCounters] fix deadlock #1260
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
besseb05
approved these changes
Jul 5, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm - although I am not familiar with the codebase
utpilla
reviewed
Jul 7, 2023
src/OpenTelemetry.Instrumentation.EventCounters/EventCountersMetrics.cs
Outdated
Show resolved
Hide resolved
reyang
approved these changes
Jul 10, 2023
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM with a changelog entry.
reyang
approved these changes
Jul 10, 2023
utpilla
approved these changes
Jul 10, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Mitigates #1024.
Changes
Below is an example of when the deadlock can occur:
EventCountersMetrics
preInitEventSources
preInitEventSources
object by thread 1EventSources
AND enable themEventSource
by thread 1EventSourceA
got enabled by thread 1OnEventWritten
callback fired on receiving an eventEventCountersInstrumentationEventSource
got lazy-initEventSource
by thread 2OnEventSourceCreated
callback firedpreInitEventSouces
preInitEventSouces
by thread 2Discussion
preInitEventSources
were added in this PR to address the issue -"As OnEventSourceCreated can run before the constructor is done, you can run into a situation where you fail to enable an EventSource instance."
@MihaZupan: Instead of the current locking mechanism, Is it possible in
OnEventSourceCreated
, we use Spinlock to wait untilthis.options
was set to ensure thatOnEventSourceCreated
will be triggered only after thector
got executed? Too hacky?For significant contributions please make sure you have completed the following items:
CHANGELOG.md
updated for non-trivial changes