Address Code Style Violations

benchmarks/Elastic.Apm.Benchmarks/Helpers/GitInfo.cs

@@ -4,7 +4,6 @@
 
 using System;
 using System.Diagnostics;
-using System.Runtime.InteropServices;
 using Elastic.Apm.Tests.Utilities;
 
 namespace Elastic.Apm.Benchmarks.Helpers

benchmarks/Elastic.Apm.Benchmarks/Program.cs

@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System;
-using System.Diagnostics;
-using System.IO;
 using BenchmarkDotNet.Configs;
 using BenchmarkDotNet.Running;
 using Elastic.Apm.Benchmarks.Helpers;

benchmarks/Elastic.Apm.Benchmarks/PropertyFetcherBenchmark.cs

@@ -5,7 +5,6 @@
 using System;
 using System.Reflection;
 using BenchmarkDotNet.Attributes;
-using Elastic.Apm.Helpers;
 using Elastic.Apm.Reflection;
 using Microsoft.Data.SqlClient;
 

sample/ApiSamples/Program.cs

@@ -166,11 +166,11 @@ public static void TwoTransactionWith2Spans()
 			Agent.Tracer.CaptureTransaction("TestTransaction1", "TestType1",
 				t =>
 				{
-					t.CaptureSpan("TestSpan", "TestSpanType", s =>
+					t.CaptureSpan("TestSpan", "TestSpanType", _ =>
 					{
 						Thread.Sleep(20);
 						//this span is also started on the transaction:
-						t.CaptureSpan("TestSpan2", "TestSpanType", s2 => { Thread.Sleep(20); });
+						t.CaptureSpan("TestSpan2", "TestSpanType", _ => { Thread.Sleep(20); });
 					});
 				});
 

sample/Elastic.Apm.Azure.ServiceBus.Sample/Program.cs

@@ -59,9 +59,7 @@ private static async Task ReadMessages()
 
 			Console.WriteLine("Printing messages:");
 			foreach (var item in messages)
-			{
 				Console.Write($"Body: {item.Body} - ");
-			}
 			Console.WriteLine($"Message count: {messages.Count}");
 			Console.WriteLine("Receiving messages from queue done");
 		}

sample/ElasticsearchSample/Program.cs

@@ -21,7 +21,7 @@ private static ConnectionSettings DefaultConnectionSettings(ConnectionSettings s
 			.DefaultIndex("index")
 			.DisableDirectStreaming();
 
-		private static async Task Main(string[] args)
+		private static async Task Main()
 		{
 			Agent.Subscribe(new ElasticsearchDiagnosticsSubscriber());
 

src/Elastic.Apm.Specification/TypeValidationError.cs

@@ -4,7 +4,6 @@
 // See the LICENSE file in the project root for more information
 
 using System;
-using System.IO;
 
 namespace Elastic.Apm.Specification
 {

src/Elastic.Apm.Specification/Validator.cs

@@ -15,7 +15,6 @@
 using System.Threading.Tasks;
 using Elastic.Apm.Api;
 using Elastic.Apm.Api.Constraints;
-using Elastic.Apm.Config;
 using Elastic.Apm.Report.Serialization;
 using ICSharpCode.SharpZipLib.Tar;
 using Elastic.Apm.Libraries.Newtonsoft.Json.Serialization;

src/Elastic.Apm/AgentComponents.cs

@@ -6,9 +6,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Runtime.InteropServices;
 using Elastic.Apm.Api;
 using Elastic.Apm.BackendComm.CentralConfig;
 using Elastic.Apm.Config;

src/Elastic.Apm/Api/Http.cs

@@ -3,10 +3,8 @@
 // See the LICENSE file in the project root for more information
 
 using System;
-using System.Net.Http;
 using Elastic.Apm.Api.Constraints;
 using Elastic.Apm.Helpers;
-using Elastic.Apm.Report.Serialization;
 using Elastic.Apm.Libraries.Newtonsoft.Json;
 
 namespace Elastic.Apm.Api

src/Elastic.Apm/Api/MetricSample.cs

@@ -4,7 +4,6 @@
 
 using System.Collections.Generic;
 using Elastic.Apm.Helpers;
-using Elastic.Apm.Libraries.Newtonsoft.Json;
 
 namespace Elastic.Apm.Api
 {

src/Elastic.Apm/Api/Tracer.cs

@@ -6,10 +6,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Threading;
 using System.Threading.Tasks;
 using Elastic.Apm.Config;
-using Elastic.Apm.DistributedTracing;
 using Elastic.Apm.Helpers;
 using Elastic.Apm.Logging;
 using Elastic.Apm.Metrics.MetricsProvider;

src/Elastic.Apm/ApmAgentExtensions.cs

@@ -4,7 +4,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using Elastic.Apm.Api;
 using Elastic.Apm.DiagnosticSource;
 

src/Elastic.Apm/BackendComm/BackendCommUtils.cs

@@ -9,7 +9,9 @@
 using System.Net.Http.Headers;
 using System.Net.Security;
 using System.Reflection;
+#if NETSTANDARD2_0 || NET6_0_OR_GREATER
 using System.Security.Authentication;
+#endif
 using System.Security.Cryptography.X509Certificates;
 using System.Text;
 using System.Text.RegularExpressions;

src/Elastic.Apm/BackendComm/CentralConfig/CentralConfigurationFetcher.cs

@@ -4,7 +4,6 @@
 // See the LICENSE file in the project root for more information
 
 using System;
-using System.Collections.Generic;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;

src/Elastic.Apm/BackendComm/CentralConfig/DynamicConfigurationOption.cs

@@ -6,7 +6,6 @@
 using System;
 using System.Collections.Generic;
 using Elastic.Apm.Config;
-using Elastic.Apm.Logging;
 using static Elastic.Apm.BackendComm.CentralConfig.DynamicConfigurationOption;
 
 namespace Elastic.Apm.BackendComm.CentralConfig

src/Elastic.Apm/Cloud/AwsCloudMetadataProvider.cs

@@ -7,7 +7,6 @@
 using System.IO;
 using System.Net.Http;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using Elastic.Apm.Api;
 using Elastic.Apm.Logging;

src/Elastic.Apm/Cloud/AzureCloudMetadataProvider.cs

@@ -7,7 +7,6 @@
 using System.IO;
 using System.Net.Http;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using Elastic.Apm.Api;
 using Elastic.Apm.Logging;

src/Elastic.Apm/Cloud/GcpCloudMetadataProvider.cs

@@ -8,7 +8,6 @@
 using System.IO;
 using System.Net.Http;
 using System.Text;
-using System.Threading;
 using System.Threading.Tasks;
 using Elastic.Apm.Api;
 using Elastic.Apm.Logging;

src/Elastic.Apm/Config/ConfigConsts.cs

@@ -8,7 +8,6 @@
 using Elastic.Apm.Cloud;
 using Elastic.Apm.Helpers;
 using Elastic.Apm.Logging;
-using static Elastic.Apm.Config.ConfigurationOption;
 
 namespace Elastic.Apm.Config
 {

src/Elastic.Apm/Config/ConfigurationLogger.cs

@@ -77,7 +77,7 @@ public static void PrintAgentLogPreamble(IApmLogger logger, IConfigurationReader
 			}
 			catch (Exception e)
 			{
-				logger?.Warning()?.LogException(e, $"Unexpected exception during {nameof(PrintAgentLogPreamble)}");
+				logger.Warning()?.LogException(e, $"Unexpected exception during {nameof(PrintAgentLogPreamble)}");
 			}
 		}
 
@@ -111,7 +111,7 @@ public static void PrintAgentConfiguration(IApmLogger logger, IConfigurationRead
 			}
 			catch (Exception e)
 			{
-				logger?.Warning()?.LogException(e, $"Unexpected exception during {nameof(PrintAgentConfiguration)}");
+				logger.Warning()?.LogException(e, $"Unexpected exception during {nameof(PrintAgentConfiguration)}");
 			}
 		}
 	}

src/Elastic.Apm/Config/EnvironmentConfiguration.cs

@@ -3,12 +3,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Elastic.Apm.Helpers;
 using Elastic.Apm.Logging;
-using static Elastic.Apm.Config.ConfigConsts;
 
 namespace Elastic.Apm.Config
 {

src/Elastic.Apm/Config/IConfiguration.cs

@@ -3,8 +3,6 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Runtime.CompilerServices;
-
 namespace Elastic.Apm.Config
 {
 	/// <summary>

src/Elastic.Apm/DiagnosticListeners/HttpDiagnosticListenerCoreImpl.cs

@@ -3,8 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Http;
 
 namespace Elastic.Apm.DiagnosticListeners

src/Elastic.Apm/DistributedTracing/TraceState.cs

@@ -6,7 +6,9 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+#if NETSTANDARD2_0 || NETFRAMEWORK
 using System.Linq;
+#endif
 using System.Text;
 using System.Threading;
 

src/Elastic.Apm/Extensions/ListExtensions.cs

@@ -18,8 +18,10 @@ internal static class ListExtensions
 		public static bool ContainsLike(this List<string> list, string matchedString)
 		{
 			foreach (var str in list)
+			{
 				if (str.IsLike(matchedString))
 					return true;
+			}
 
 			return false;
 		}

src/Elastic.Apm/Helpers/CollectionExtensions.cs

@@ -2,9 +2,7 @@
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.
 // See the LICENSE file in the project root for more information
 
-using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Runtime.CompilerServices;
 
 namespace Elastic.Apm.Helpers

src/Elastic.Apm/Helpers/ExceptionUtils.cs

@@ -4,7 +4,6 @@
 
 using System;
 using System.Runtime.CompilerServices;
-using System.Threading.Tasks;
 using Elastic.Apm.Logging;
 
 namespace Elastic.Apm.Helpers

src/Elastic.Apm/Helpers/SystemInfoHelper.cs

@@ -4,7 +4,6 @@
 
 using System;
 using System.IO;
-using System.Net;
 using System.Text.RegularExpressions;
 using Elastic.Apm.Api;
 using Elastic.Apm.Api.Kubernetes;

src/Elastic.Apm/ICurrentExecutionSegmentsContainer.cs

@@ -3,7 +3,6 @@
 // See the LICENSE file in the project root for more information
 
 using Elastic.Apm.Api;
-using Elastic.Apm.Model;
 
 namespace Elastic.Apm
 {

src/Elastic.Apm/Libraries/.editorconfig

@@ -18,7 +18,7 @@ dotnet_diagnostic.CS8625.severity = none
 dotnet_diagnostic.CS8618.severity = none
 dotnet_diagnostic.CS8620.severity = none
 dotnet_diagnostic.CS8762.severity = none
-
+generated_code = true
 
 csharp_style_var_for_built_in_types = false:none
 csharp_style_var_when_type_is_apparent = false:none

src/Elastic.Apm/Libraries/Newtonsoft.Json/Converters/BinaryConverter.cs

@@ -30,7 +30,6 @@
 using System.Globalization;
 using Elastic.Apm.Libraries.Newtonsoft.Json.Utilities;
 using System.Collections.Generic;
-using System.Diagnostics;
 #if HAVE_ADO_NET
 using System.Data.SqlTypes;
 #endif

src/Elastic.Apm/Libraries/Newtonsoft.Json/Converters/EntityKeyMemberConverter.cs

@@ -30,7 +30,6 @@
 using Elastic.Apm.Libraries.Newtonsoft.Json.Serialization;
 using System.Globalization;
 using Elastic.Apm.Libraries.Newtonsoft.Json.Utilities;
-using System.Diagnostics;
 
 #nullable enable
 namespace Elastic.Apm.Libraries.Newtonsoft.Json.Converters

src/Elastic.Apm/Libraries/Newtonsoft.Json/Converters/ExpandoObjectConverter.cs

@@ -30,8 +30,6 @@
 using System.Collections.Generic;
 using System.Dynamic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
 using Elastic.Apm.Libraries.Newtonsoft.Json.Utilities;
 
 #nullable enable

src/Elastic.Apm/Libraries/Newtonsoft.Json/Converters/StringEnumConverter.cs

@@ -32,7 +32,6 @@
 #if !HAVE_LINQ
 
 #else
-using System.Linq;
 
 #endif
 

src/Elastic.Apm/Libraries/Newtonsoft.Json/JsonTextReader.Async.cs

@@ -35,7 +35,6 @@
 using System.Threading.Tasks;
 using Elastic.Apm.Libraries.Newtonsoft.Json.Serialization;
 using Elastic.Apm.Libraries.Newtonsoft.Json.Utilities;
-using System.Diagnostics;
 
 #nullable enable
 namespace Elastic.Apm.Libraries.Newtonsoft.Json

src/Elastic.Apm/Libraries/Newtonsoft.Json/JsonTextWriter.Async.cs

@@ -34,7 +34,6 @@
 #endif
 using System.Threading.Tasks;
 using Elastic.Apm.Libraries.Newtonsoft.Json.Utilities;
-using System.Diagnostics;
 
 #nullable enable
 namespace Elastic.Apm.Libraries.Newtonsoft.Json

src/Elastic.Apm/Libraries/Newtonsoft.Json/Linq/JContainer.Async.cs

@@ -27,7 +27,6 @@
 
 #if HAVE_ASYNC
 using System;
-using System.Diagnostics;
 using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;

src/Elastic.Apm/Libraries/Newtonsoft.Json/Linq/JContainer.cs

@@ -39,7 +39,6 @@
 #if !HAVE_LINQ
 
 #else
-using System.Linq;
 #endif
 
 #nullable enable

src/Elastic.Apm/Libraries/Newtonsoft.Json/Linq/JObject.Async.cs

@@ -26,7 +26,6 @@
 #endregion
 
 #if HAVE_ASYNC
-using System;
 using System.Globalization;
 using System.Threading;
 using System.Threading.Tasks;

src/Elastic.Apm/Libraries/Newtonsoft.Json/Linq/JObject.cs

@@ -26,7 +26,6 @@
 #endregion
 
 #if HAVE_INOTIFY_COLLECTION_CHANGED
-using System.Collections.ObjectModel;
 using System.Collections.Specialized;
 #endif
 #if HAVE_DYNAMIC

src/Elastic.Apm/Libraries/Newtonsoft.Json/Serialization/DefaultContractResolver.cs

@@ -26,7 +26,6 @@
 #endregion
 
 #if HAVE_CONCURRENT_DICTIONARY
-using System.Collections.Concurrent;
 #endif
 #if HAVE_DYNAMIC
 using System.Dynamic;

src/Elastic.Apm/Libraries/Newtonsoft.Json/Serialization/JsonArrayContract.cs

@@ -34,7 +34,6 @@
 #if !HAVE_LINQ
 
 #else
-using System.Linq;
 
 #endif
 

src/Elastic.Apm/Libraries/Newtonsoft.Json/Serialization/JsonContainerContract.cs

@@ -30,7 +30,6 @@
 #if !HAVE_LINQ
 
 #else
-using System.Linq;
 
 #endif