fix: Fix a segfault when using sendDataOnExit with Linux on Docker. (#…

…2018)
newrelic · Nov 2, 2023 · 3ac75a0 · 3ac75a0
1 parent 4b75587
commit 3ac75a0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/src/Agent/NewRelic/Agent/Core/AgentManager.cs b/src/Agent/NewRelic/Agent/Core/AgentManager.cs
@@ -370,6 +370,7 @@ private void Shutdown(bool cleanShutdown)
 
                 if (cleanShutdown)
                 {
+                    Log.Debug("Agent is connected, executing a clean shutdown.");
                     EventBus<PreCleanShutdownEvent>.Publish(new PreCleanShutdownEvent());
                     EventBus<CleanShutdownEvent>.Publish(new CleanShutdownEvent());
                 }

diff --git a/src/Agent/NewRelic/Agent/Core/Samplers/AbstractSampler.cs b/src/Agent/NewRelic/Agent/Core/Samplers/AbstractSampler.cs
@@ -18,7 +18,7 @@ protected virtual bool Enabled
         {
             get
             {
-                return !_configuration.DisableSamplers;
+                return !_configuration.DisableSamplers && !Agent.IsAgentShuttingDown;
             }
         }
 

diff --git a/src/Agent/NewRelic/Agent/Core/Time/Scheduler.cs b/src/Agent/NewRelic/Agent/Core/Time/Scheduler.cs
@@ -70,7 +70,7 @@ public void ExecuteEvery(Action action, TimeSpan timeBetweenExecutions, TimeSpan
                 var existingTimer = _recurringTimers.GetValueOrDefault(action);
                 if (existingTimer != null)
                 {
-                    Log.Debug("Stopping existing timer for scheduled action");
+                    Log.Debug("Stopping existing timer for scheduled action for " + action.Method.DeclaringType.FullName + "." + action.Method.Name);
                     existingTimer.Dispose();
                 }
 

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -4,5 +4,6 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), 'FullAgent.sln'))\build\StyleCop.props" />
   <PropertyGroup>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <NuGetAudit>false</NuGetAudit>
   </PropertyGroup>
 </Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ protected virtual bool Enabled @@
             {
                 get
                 {
-                    return !_configuration.DisableSamplers;
+                    return !_configuration.DisableSamplers && !Agent.IsAgentShuttingDown;
                 }
             }
@@ Expand Down @@