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

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

Merged
merged 4 commits into from
Nov 2, 2023
Merged

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

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3fa584
fix: Fix a segfault when using sendDataOnExit with Linux on Docker.
jaffinito Oct 30, 2023
eb4de87
Fixed AbstractSampler.cs and GCSamplerNetCore.cs in particular.
jaffinito Nov 1, 2023
915c68f
Undo changes to ApiAppNameChange tests.
jaffinito Nov 1, 2023
c59f8cd
Move disabling NugetAudit from CMF Helper to props for all tests.
jaffinito Nov 1, 2023
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
1 change: 1 addition & 0 deletions src/Agent/NewRelic/Agent/Core/AgentManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
2 changes: 1 addition & 1 deletion src/Agent/NewRelic/Agent/Core/Samplers/AbstractSampler.cs
View file
Open in desktop
Original file line number Diff 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
2 changes: 1 addition & 1 deletion src/Agent/NewRelic/Agent/Core/Time/Scheduler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
1 change: 1 addition & 0 deletions ...pplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
<LangVersion>default</LangVersion>
<NuGetAudit>false</NuGetAudit>
jaffinito marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>

<ItemGroup>
Expand Down
Loading