Merge branch 'develop' into rajrang/metricagg

BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/HeartbeatProvider.cs

@@ -120,9 +120,15 @@
             {
                 if (!this.isEnabled && value)
                 {
-                    // we need to start calling the timer again
-                    // if requested to disable, let the next HeartbeatPulse disable it for us (do nothing here)
-                    this.HeartbeatTimer.Change(this.HeartbeatInterval, this.HeartbeatInterval);
+                    // we need to start calling the timer again                    
+                    this.HeartbeatTimer?.Change(this.HeartbeatInterval, this.HeartbeatInterval);
+                }
+                else if (this.isEnabled && !value)
+                {
+                    // heartbeat was enabled previously, and being disabled now.
+                    // dispose timers so they never fire again.
+                    this.HeartbeatTimer?.Change(Timeout.Infinite, Timeout.Infinite);
+                    this.HeartbeatTimer?.Dispose();
                 }
 
                 this.isEnabled = value;

CHANGELOG.md

@@ -2,8 +2,10 @@
 
 ## VNext
 - [Fix: Disabling HeartBeats in Asp.Net Core projects causes Error traces every heart beat interval (15 minutes defualt)](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1681)
+
 - [Standard Metric extractor (Exception,Trace) populates all standard dimensions.](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1738)
 
+
 ## Version 2.14.0-beta3
 - [New: JavaScript Property to support Content Security Policy](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1443)
 - [Fix: All perf counters stop being collected when any of faulty counters are specified to collect on Azure WebApps](https://github.com/microsoft/ApplicationInsights-dotnet/issues/1686)