From c9397024007f2524dec31959e5b505b8d4ff89c3 Mon Sep 17 00:00:00 2001
From: Russ Cam <russ.cam@forloop.co.uk>
Date: Tue, 12 Jan 2021 13:12:29 +1000
Subject: [PATCH] Update directives from merge

---
 test/Elastic.Apm.AspNetFullFramework.Tests/WebApiTests.cs     | 4 +---
 .../BackendCommTests/BackendCommUtilsTests.cs                 | 1 -
 test/Elastic.Apm.Tests/BackendCommTests/PayloadSenderTests.cs | 1 -
 test/Elastic.Apm.Tests/FilterTests.cs                         | 1 -
 test/Elastic.Apm.Tests/HelpersTests/AgentSpinLockTests.cs     | 2 --
 test/Elastic.Apm.Tests/HelpersTests/AgentTimeInstantTests.cs  | 1 -
 test/Elastic.Apm.Tests/HelpersTests/AgentTimerTests.cs        | 1 -
 .../HelpersTests/DbConnectionStringParserTests.cs             | 1 -
 test/Elastic.Apm.Tests/HelpersTests/ExceptionUtilsTests.cs    | 1 -
 test/Elastic.Apm.Tests/HelpersTests/IntExtensionsTests.cs     | 1 -
 .../Elastic.Apm.Tests/HelpersTests/LazyContextualInitTests.cs | 2 --
 test/Elastic.Apm.Tests/HelpersTests/TimeExtensionsTests.cs    | 1 -
 test/Elastic.Apm.Tests/HttpDiagnosticListenerTests.cs         | 1 -
 test/Elastic.Apm.Tests/Metrics/CgroupMetricsProviderTests.cs  | 1 -
 test/Elastic.Apm.Tests/MetricsTests.cs                        | 1 -
 test/Elastic.Apm.Tests/TransactionSamplingTests.cs            | 1 -
 16 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/test/Elastic.Apm.AspNetFullFramework.Tests/WebApiTests.cs b/test/Elastic.Apm.AspNetFullFramework.Tests/WebApiTests.cs
index a7926fd27..694b2e24e 100644
--- a/test/Elastic.Apm.AspNetFullFramework.Tests/WebApiTests.cs
+++ b/test/Elastic.Apm.AspNetFullFramework.Tests/WebApiTests.cs
@@ -5,10 +5,8 @@
 
 using System.IO;
 using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
 using System.Threading.Tasks;
-using Elastic.Apm.Tests.TestHelpers;
+using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using Xunit;
 using Xunit.Abstractions;
diff --git a/test/Elastic.Apm.Tests/BackendCommTests/BackendCommUtilsTests.cs b/test/Elastic.Apm.Tests/BackendCommTests/BackendCommUtilsTests.cs
index 1c661de04..cf4cc43c2 100644
--- a/test/Elastic.Apm.Tests/BackendCommTests/BackendCommUtilsTests.cs
+++ b/test/Elastic.Apm.Tests/BackendCommTests/BackendCommUtilsTests.cs
@@ -4,7 +4,6 @@
 
 using System;
 using Elastic.Apm.Api;
-using Elastic.Apm.Tests.TestHelpers;
 using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using Xunit;
diff --git a/test/Elastic.Apm.Tests/BackendCommTests/PayloadSenderTests.cs b/test/Elastic.Apm.Tests/BackendCommTests/PayloadSenderTests.cs
index 0e6f10ba2..fc8f0e9f9 100644
--- a/test/Elastic.Apm.Tests/BackendCommTests/PayloadSenderTests.cs
+++ b/test/Elastic.Apm.Tests/BackendCommTests/PayloadSenderTests.cs
@@ -16,7 +16,6 @@
 using Elastic.Apm.Logging;
 using Elastic.Apm.Model;
 using Elastic.Apm.Report;
-using Elastic.Apm.Tests.TestHelpers;
 using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using FluentAssertions.Extensions;
diff --git a/test/Elastic.Apm.Tests/FilterTests.cs b/test/Elastic.Apm.Tests/FilterTests.cs
index 5d167d332..1ac1e21b2 100644
--- a/test/Elastic.Apm.Tests/FilterTests.cs
+++ b/test/Elastic.Apm.Tests/FilterTests.cs
@@ -16,7 +16,6 @@
 using Elastic.Apm.Model;
 using Elastic.Apm.Report;
 using Elastic.Apm.Report.Serialization;
-using Elastic.Apm.Tests.TestHelpers;
 using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using Newtonsoft.Json;
diff --git a/test/Elastic.Apm.Tests/HelpersTests/AgentSpinLockTests.cs b/test/Elastic.Apm.Tests/HelpersTests/AgentSpinLockTests.cs
index 50735ee1f..88edadb6a 100644
--- a/test/Elastic.Apm.Tests/HelpersTests/AgentSpinLockTests.cs
+++ b/test/Elastic.Apm.Tests/HelpersTests/AgentSpinLockTests.cs
@@ -7,8 +7,6 @@
 using System.Threading;
 using Elastic.Apm.Helpers;
 using Elastic.Apm.Logging;
-using Elastic.Apm.Tests.Extensions;
-using Elastic.Apm.Tests.TestHelpers;
 using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using Xunit;
diff --git a/test/Elastic.Apm.Tests/HelpersTests/AgentTimeInstantTests.cs b/test/Elastic.Apm.Tests/HelpersTests/AgentTimeInstantTests.cs
index 9f18859f9..66e44e11d 100644
--- a/test/Elastic.Apm.Tests/HelpersTests/AgentTimeInstantTests.cs
+++ b/test/Elastic.Apm.Tests/HelpersTests/AgentTimeInstantTests.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using Elastic.Apm.Logging;
-using Elastic.Apm.Tests.TestHelpers;
 using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using FluentAssertions.Extensions;
diff --git a/test/Elastic.Apm.Tests/HelpersTests/AgentTimerTests.cs b/test/Elastic.Apm.Tests/HelpersTests/AgentTimerTests.cs
index 212ec4148..fc5793aed 100644
--- a/test/Elastic.Apm.Tests/HelpersTests/AgentTimerTests.cs
+++ b/test/Elastic.Apm.Tests/HelpersTests/AgentTimerTests.cs
@@ -9,7 +9,6 @@
 using System.Threading.Tasks;
 using Elastic.Apm.Helpers;
 using Elastic.Apm.Logging;
-using Elastic.Apm.Tests.TestHelpers;
 using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using FluentAssertions.Extensions;
diff --git a/test/Elastic.Apm.Tests/HelpersTests/DbConnectionStringParserTests.cs b/test/Elastic.Apm.Tests/HelpersTests/DbConnectionStringParserTests.cs
index 5a9eda9f0..a50435b40 100644
--- a/test/Elastic.Apm.Tests/HelpersTests/DbConnectionStringParserTests.cs
+++ b/test/Elastic.Apm.Tests/HelpersTests/DbConnectionStringParserTests.cs
@@ -5,7 +5,6 @@
 using System.Text;
 using Elastic.Apm.Helpers;
 using Elastic.Apm.Logging;
-using Elastic.Apm.Tests.TestHelpers;
 using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using Xunit;
diff --git a/test/Elastic.Apm.Tests/HelpersTests/ExceptionUtilsTests.cs b/test/Elastic.Apm.Tests/HelpersTests/ExceptionUtilsTests.cs
index 2ac547aaa..d69dfdf74 100644
--- a/test/Elastic.Apm.Tests/HelpersTests/ExceptionUtilsTests.cs
+++ b/test/Elastic.Apm.Tests/HelpersTests/ExceptionUtilsTests.cs
@@ -7,7 +7,6 @@
 using System.Threading.Tasks;
 using Elastic.Apm.Helpers;
 using Elastic.Apm.Logging;
-using Elastic.Apm.Tests.TestHelpers;
 using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using Xunit;
diff --git a/test/Elastic.Apm.Tests/HelpersTests/IntExtensionsTests.cs b/test/Elastic.Apm.Tests/HelpersTests/IntExtensionsTests.cs
index 820282306..5532ad68d 100644
--- a/test/Elastic.Apm.Tests/HelpersTests/IntExtensionsTests.cs
+++ b/test/Elastic.Apm.Tests/HelpersTests/IntExtensionsTests.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.Threading.Tasks;
-using Elastic.Apm.Tests.TestHelpers;
 using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using Xunit;
diff --git a/test/Elastic.Apm.Tests/HelpersTests/LazyContextualInitTests.cs b/test/Elastic.Apm.Tests/HelpersTests/LazyContextualInitTests.cs
index d20c6fbc2..fc25e93aa 100644
--- a/test/Elastic.Apm.Tests/HelpersTests/LazyContextualInitTests.cs
+++ b/test/Elastic.Apm.Tests/HelpersTests/LazyContextualInitTests.cs
@@ -6,8 +6,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Elastic.Apm.Helpers;
-using Elastic.Apm.Tests.Extensions;
-using Elastic.Apm.Tests.TestHelpers;
 using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using Xunit;
diff --git a/test/Elastic.Apm.Tests/HelpersTests/TimeExtensionsTests.cs b/test/Elastic.Apm.Tests/HelpersTests/TimeExtensionsTests.cs
index 1e7643a52..1ae7bc811 100644
--- a/test/Elastic.Apm.Tests/HelpersTests/TimeExtensionsTests.cs
+++ b/test/Elastic.Apm.Tests/HelpersTests/TimeExtensionsTests.cs
@@ -5,7 +5,6 @@
 using System;
 using System.Collections.Generic;
 using Elastic.Apm.Helpers;
-using Elastic.Apm.Tests.TestHelpers;
 using FluentAssertions;
 using FluentAssertions.Extensions;
 using Xunit;
diff --git a/test/Elastic.Apm.Tests/HttpDiagnosticListenerTests.cs b/test/Elastic.Apm.Tests/HttpDiagnosticListenerTests.cs
index af5342f3f..641e353fe 100644
--- a/test/Elastic.Apm.Tests/HttpDiagnosticListenerTests.cs
+++ b/test/Elastic.Apm.Tests/HttpDiagnosticListenerTests.cs
@@ -17,7 +17,6 @@
 using Elastic.Apm.DiagnosticSource;
 using Elastic.Apm.Logging;
 using Elastic.Apm.Tests.HelpersTests;
-using Elastic.Apm.Tests.TestHelpers;
 using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using FluentAssertions.Execution;
diff --git a/test/Elastic.Apm.Tests/Metrics/CgroupMetricsProviderTests.cs b/test/Elastic.Apm.Tests/Metrics/CgroupMetricsProviderTests.cs
index 475223c38..0c649bce9 100644
--- a/test/Elastic.Apm.Tests/Metrics/CgroupMetricsProviderTests.cs
+++ b/test/Elastic.Apm.Tests/Metrics/CgroupMetricsProviderTests.cs
@@ -7,7 +7,6 @@
 using System.IO;
 using System.Linq;
 using Elastic.Apm.Metrics.MetricsProvider;
-using Elastic.Apm.Tests.TestHelpers;
 using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using Xunit;
diff --git a/test/Elastic.Apm.Tests/MetricsTests.cs b/test/Elastic.Apm.Tests/MetricsTests.cs
index f5731115f..62ace6f33 100644
--- a/test/Elastic.Apm.Tests/MetricsTests.cs
+++ b/test/Elastic.Apm.Tests/MetricsTests.cs
@@ -15,7 +15,6 @@
 using Elastic.Apm.Logging;
 using Elastic.Apm.Metrics;
 using Elastic.Apm.Metrics.MetricsProvider;
-using Elastic.Apm.Tests.TestHelpers;
 using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using Moq;
diff --git a/test/Elastic.Apm.Tests/TransactionSamplingTests.cs b/test/Elastic.Apm.Tests/TransactionSamplingTests.cs
index dadf9ee4b..a5d431bc0 100644
--- a/test/Elastic.Apm.Tests/TransactionSamplingTests.cs
+++ b/test/Elastic.Apm.Tests/TransactionSamplingTests.cs
@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System.Linq;
-using Elastic.Apm.Tests.TestHelpers;
 using Elastic.Apm.Tests.Utilities;
 using FluentAssertions;
 using Xunit;