From 6d09a01ad5a71533a7b641ee9c32da1cbb4598a3 Mon Sep 17 00:00:00 2001
From: Marty Tippin <120425148+tippmar-nr@users.noreply.github.com>
Date: Tue, 18 Jul 2023 13:07:32 -0500
Subject: [PATCH] Final tweaks for Dispose issues

---
 src/Agent/NewRelic/Agent/Core/Samplers/GCSamplerNetCore.cs   | 2 +-
 src/Agent/NewRelic/Agent/Core/Samplers/ThreadStatsSampler.cs | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Agent/NewRelic/Agent/Core/Samplers/GCSamplerNetCore.cs b/src/Agent/NewRelic/Agent/Core/Samplers/GCSamplerNetCore.cs
index 74298bac1..1b35028c9 100644
--- a/src/Agent/NewRelic/Agent/Core/Samplers/GCSamplerNetCore.cs
+++ b/src/Agent/NewRelic/Agent/Core/Samplers/GCSamplerNetCore.cs
@@ -129,7 +129,7 @@ public override void Dispose()
         {
             base.Dispose();
             _listener?.StopListening();
-            //_listener?.Dispose();
+            _listener?.Dispose();
             _listener = null;
         }
     }
diff --git a/src/Agent/NewRelic/Agent/Core/Samplers/ThreadStatsSampler.cs b/src/Agent/NewRelic/Agent/Core/Samplers/ThreadStatsSampler.cs
index 9eaca1c08..fcc769131 100644
--- a/src/Agent/NewRelic/Agent/Core/Samplers/ThreadStatsSampler.cs
+++ b/src/Agent/NewRelic/Agent/Core/Samplers/ThreadStatsSampler.cs
@@ -79,7 +79,9 @@ public override void Dispose()
         {
             base.Dispose();
             _listener?.StopListening();
-            //_listener?.Dispose();
+#if NETFRAMEWORK // calling .Dispose() in .NET 7 explodes. No idea why.
+                _listener?.Dispose();
+#endif
             _listener = null;
         }
     }