Skip to content

Fix : memory leak caused by DotNetEventListener class #29

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

Merged
merged 1 commit into from
Jan 30, 2020
Merged

Fix : memory leak caused by DotNetEventListener class #29

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 18 additions & 20 deletions src/prometheus-net.DotNetRuntime/DotNetEventListener.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
using Prometheus.DotNetRuntime.StatsCollectors.Util;
using System;
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics;
using System.Diagnostics.Tracing;
using System.Linq;
using Prometheus.DotNetRuntime.StatsCollectors;
using Prometheus.DotNetRuntime.StatsCollectors.Util;

namespace Prometheus.DotNetRuntime
{
Expand All @@ -24,32 +20,28 @@ internal DotNetEventListener(IEventSourceStatsCollector collector, Action<Except
_collector = collector;
_errorHandler = errorHandler;
_enableDebugging = enableDebugging;

if (_enableDebugging)
{
_eventTypeCounts ??= Metrics.CreateCounter($"dotnet_debug_events_total", "The total number of .NET diagnostic events processed", "collector_name", "event_source_name", "event_name");
_cpuConsumed ??= Metrics.CreateCounter("dotnet_debug_cpu_seconds_total", "The total CPU time consumed by processing .NET diagnostic events (does not include the CPU cost to generate the events)", "collector_name", "event_source_name", "event_name");
_nameSnakeCase = collector.GetType().Name.ToSnakeCase();
}

EnableEventSources(collector);
EventSourceCreated += OnEventSourceCreated;
Copy link

@george-chakhidze george-chakhidze Jan 9, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably simply overriding EventListener.OnEventSourceCreated method could be simpler, you will not have to be bothered about unsubscribing at all.

}

internal bool StartedReceivingEvents { get; private set; }

private void EnableEventSources(IEventSourceStatsCollector forCollector)
private void OnEventSourceCreated(object sender, EventSourceCreatedEventArgs e)
{
EventSourceCreated += (sender, e) =>
var es = e.EventSource;
if (es.Guid == _collector.EventSourceGuid)
{
var es = e.EventSource;
if (es.Guid == forCollector.EventSourceGuid)
{
EnableEvents(es, forCollector.Level, forCollector.Keywords);
StartedReceivingEvents = true;
}
};
EnableEvents(es, _collector.Level, _collector.Keywords);
StartedReceivingEvents = true;
}
}

protected override void OnEventWritten(EventWrittenEventArgs eventData)
{
var sp = new Stopwatch();
Expand All @@ -60,7 +52,7 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
_eventTypeCounts.Labels(_nameSnakeCase, eventData.EventSource.Name, eventData.EventName).Inc();
sp.Restart();
}

_collector.ProcessEvent(eventData);

if (_enableDebugging)
Expand All @@ -74,5 +66,11 @@ protected override void OnEventWritten(EventWrittenEventArgs eventData)
_errorHandler(e);
}
}

public override void Dispose()
{
EventSourceCreated -= OnEventSourceCreated;
base.Dispose();
}
}
}