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

[EventCounters] fix deadlock #1260

Merged
merged 5 commits into from
Jul 10, 2023
Merged

[EventCounters] fix deadlock #1260

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
3e2015d
initial
Yun-Ting Jul 5, 2023
5cbfebe
Merge branch 'main' into yunl/fixDeadlock
Yun-Ting Jul 5, 2023
ed5b225
address comments
Yun-Ting Jul 10, 2023
a82893b
Merge branch 'yunl/fixDeadlock' of https://github.com/Yun-Ting/opente…
Yun-Ting Jul 10, 2023
2fbe2db
changelog
Yun-Ting Jul 10, 2023
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
6 changes: 6 additions & 0 deletions src/OpenTelemetry.Instrumentation.EventCounters/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

## Unreleased

* Added a static constructor to ensure `EventCountersInstrumentationEventSource`
got initialized when `EventCountersMetrics` was accessed for the first time to
prevent potential deadlock;
e.g.: <https://github.com/open-telemetry/opentelemetry-dotnet-contrib/issues/1024>.
([#1260](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1260))

* Update OpenTelemetry.Api to 1.5.1.
([#1255](https://github.com/open-telemetry/opentelemetry-dotnet-contrib/pull/1255))

Expand Down
8 changes: 8 additions & 0 deletions src/OpenTelemetry.Instrumentation.EventCounters/EventCountersMetrics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ internal sealed class EventCountersMetrics : EventListener
private readonly ConcurrentDictionary<(string, string), double> values = new();
private bool isDisposed;

static EventCountersMetrics()
{
// Ensure EventCountersInstrumentationEventSource got initialized when the class was accessed for the first time
// to prevent potential deadlock:
// https://github.com/open-telemetry/opentelemetry-dotnet-contrib/issues/1024.
_ = EventCountersInstrumentationEventSource.Log;
}

/// <summary>
/// Initializes a new instance of the <see cref="EventCountersMetrics"/> class.
/// </summary>
Expand Down