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

[Instrumentation.EventCounters] Avoid race condition and performance trap in EventCountersMetrics #703

Merged
merged 3 commits into from
Oct 18, 2022
Merged

[Instrumentation.EventCounters] Avoid race condition and performance trap in EventCountersMetrics #703

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a222ac3
Avoid race condition and performance trap in EventCountersMetrics
MihaZupan Oct 17, 2022
7c1f538
Match repo-prefered code style
MihaZupan Oct 18, 2022
6039ccc
Merge branch 'main' into EventCountersMetrics
utpilla Oct 18, 2022
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
39 changes: 26 additions & 13 deletions src/OpenTelemetry.Instrumentation.EventCounters/EventCountersMetrics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ internal sealed class EventCountersMetrics : EventListener
internal static readonly Meter MeterInstance = new(typeof(EventCountersMetrics).Assembly.GetName().Name, typeof(EventCountersMetrics).Assembly.GetName().Version.ToString());

private readonly EventCountersInstrumentationOptions options;
private readonly ConcurrentQueue<EventSource> preInitEventSources = new();
private readonly List<EventSource> preInitEventSources = new();
private readonly ConcurrentDictionary<(string, string), Instrument> instruments = new();
private readonly ConcurrentDictionary<(string, string), double> values = new();

Expand All @@ -40,27 +40,35 @@ internal sealed class EventCountersMetrics : EventListener
/// <param name="options">The options to define the metrics.</param>
public EventCountersMetrics(EventCountersInstrumentationOptions options)
{
this.options = options;

while (this.preInitEventSources.TryDequeue(out EventSource eventSource))
lock (this.preInitEventSources)
{
if (this.options.ShouldListenToSource(eventSource.Name))
this.options = options;

foreach (EventSource eventSource in this.preInitEventSources)
{
this.EnableEvents(eventSource, EventLevel.LogAlways, EventKeywords.None, GetEnableEventsArguments(this.options));
if (this.options.ShouldListenToSource(eventSource.Name))
{
this.EnableEvents(eventSource);
}
}

this.preInitEventSources.Clear();
}
}

/// <inheritdoc />
protected override void OnEventSourceCreated(EventSource source)
protected override void OnEventSourceCreated(EventSource eventSource)
{
if (this.options == null)
lock (this.preInitEventSources)
utpilla marked this conversation as resolved.
Show resolved Hide resolved
{
this.preInitEventSources.Enqueue(source);
}
else if (this.options.ShouldListenToSource(source.Name))
{
this.EnableEvents(source, EventLevel.LogAlways, EventKeywords.None, GetEnableEventsArguments(this.options));
if (this.options == null)
{
this.preInitEventSources.Add(eventSource);
}
else if (this.options.ShouldListenToSource(eventSource.Name))
{
this.EnableEvents(eventSource);
}
}
}

Expand Down Expand Up @@ -112,6 +120,11 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
private static Dictionary<string, string> GetEnableEventsArguments(EventCountersInstrumentationOptions options) =>
new() { { "EventCounterIntervalSec", options.RefreshIntervalSecs.ToString() } };

private void EnableEvents(EventSource eventSource)
{
this.EnableEvents(eventSource, EventLevel.Critical, EventKeywords.None, GetEnableEventsArguments(this.options));
}

private void UpdateInstrumentWithEvent(bool isGauge, string eventSourceName, string name, double value)
{
try
Expand Down