Skip to content

Fix Object disposed exception #7866

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

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Fix Object disposed exception #7866

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
28 changes: 22 additions & 6 deletions tracer/src/Datadog.Trace/Debugger/ProbeStatuses/ProbeStatusPoller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ internal class ProbeStatusPoller : IProbeStatusPoller
private Timer _pollerTimer;
private bool _isPolling;
private bool _isRecentlyForcedSchedule;
private bool _disposed;

private ProbeStatusPoller(DiagnosticsSink diagnosticsSink)
{
Expand Down Expand Up @@ -82,7 +83,10 @@ private void PausePollerTimer()
{
try
{
_pollerTimer?.Change(Timeout.Infinite, Timeout.Infinite);
if (!_disposed)
{
_pollerTimer?.Change(Timeout.Infinite, Timeout.Infinite);
}
}
catch (Exception ex)
{
Expand All @@ -94,9 +98,12 @@ private void ResumePollerTimer()
{
try
{
var waitPeriod = _isRecentlyForcedSchedule ? _shortPeriod : _longPeriod;
_pollerTimer?.Change(waitPeriod, waitPeriod);
_isRecentlyForcedSchedule = false;
if (!_disposed)
{
var waitPeriod = _isRecentlyForcedSchedule ? _shortPeriod : _longPeriod;
_pollerTimer?.Change(waitPeriod, waitPeriod);
_isRecentlyForcedSchedule = false;
}
}
catch (Exception ex)
{
Expand Down Expand Up @@ -172,7 +179,7 @@ private void ScheduleNextPollInOneSecond()
{
lock (_locker)
{
if (_isPolling)
if (_isPolling && !_disposed)
{
_pollerTimer?.Change(TimeSpan.FromSeconds(1), _shortPeriod);
_isRecentlyForcedSchedule = true;
Expand Down Expand Up @@ -226,7 +233,16 @@ public string[] GetBoundedProbes()

public void Dispose()
{
_pollerTimer?.Dispose();
lock (_locker)
{
if (_disposed)
{
return;
}

_disposed = true;
_pollerTimer?.Dispose();
}
}
}
}
Loading