Adapt GcMetricsProvider to work on .NET5 (#1026)

From #1006
elastic · Nov 11, 2020 · 5a626ac · 5a626ac
1 parent 9f6dd86
commit 5a626ac
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/Elastic.Apm/Metrics/MetricsProvider/GcMetricsProvider.cs b/src/Elastic.Apm/Metrics/MetricsProvider/GcMetricsProvider.cs
@@ -115,7 +115,7 @@ public GcMetricsProvider(IApmLogger logger, bool collectGcCount = true, bool col
 				}
 			}
 
-			if (PlatformDetection.IsDotNetCore)
+			if (PlatformDetection.IsDotNetCore || PlatformDetection.IsDotNet5)
 				_eventListener = new GcEventListener(this, logger);
 		}
 
@@ -141,7 +141,7 @@ public IEnumerable<MetricSample> GetSamples()
 		{
 			if (_gcCount != 0 || _gen0Size != 0 || _gen2Size != 0 || _gen3Size != 0)
 			{
-				var retVal = new List<MetricSample>();
+				var retVal = new List<MetricSample>(5);
 
 				if (_collectGcCount)
 					retVal.Add(new MetricSample(GcCountName, _gcCount));

diff --git a/test/Elastic.Apm.Tests/ConfigTests.cs b/test/Elastic.Apm.Tests/ConfigTests.cs
@@ -226,7 +226,7 @@ public void ReadServerUrlsWithSpaceAtTheEndViaEnvironmentVariable()
 			var payloadSender = new MockPayloadSender();
 			using (var agent = new ApmAgent(new TestAgentComponents(payloadSender: payloadSender, config: new EnvironmentConfigurationReader())))
 			{
-#if !NETCOREAPP3_0 && !NETCOREAPP3_1
+#if !NETCOREAPP3_0 && !NETCOREAPP3_1 && !NET5_0
 				agent.ConfigurationReader.ServerUrls.First().Should().NotBe(serverUrlsWithSpace);
 #endif
 				agent.ConfigurationReader.ServerUrls.First().Should().Be("http://myServer:1234");

diff --git a/test/Elastic.Apm.Tests/MetricsTests.cs b/test/Elastic.Apm.Tests/MetricsTests.cs
@@ -319,7 +319,7 @@ public void CollectGcMetrics()
 					}
 				}
 
-				if (PlatformDetection.IsDotNetCore)
+				if (PlatformDetection.IsDotNetCore || PlatformDetection.IsDotNet5)
 				{
 					if (!logger.Lines.Where(n => n.Contains("OnEventWritten with GC")).Any())
 					{
-Original file line number
+Diff line change
@@ Expand Up / @@ -319,7 +319,7 @@ public void CollectGcMetrics() @@
     					}
     				}
-    				if (PlatformDetection.IsDotNetCore)
+    				if (PlatformDetection.IsDotNetCore || PlatformDetection.IsDotNet5)
     				{
     					if (!logger.Lines.Where(n => n.Contains("OnEventWritten with GC")).Any())
     					{
@@ Expand Down @@