Enable Roslyn analysis - Test Applications - final

Author: Kielek

test/IntegrationTests/ContinuousProfilerTests.cs

@@ -112,8 +112,8 @@ private static bool ContainPeriod(Profile profile, string profilingSampleType, s
 
     private static List<string> CreateExpectedStackTrace()
     {
-        var stackTrace = new List<string>
-        {
+        List<string> stackTrace =
+        [
             "System.Threading.Thread.Sleep(System.TimeSpan)",
             "TestApplication.ContinuousProfiler.Fs.ClassFs.methodFs(System.String)",
             "TestApplication.ContinuousProfiler.Vb.ClassVb.MethodVb(System.String)",
@@ -126,7 +126,7 @@ private static List<string> CreateExpectedStackTrace()
             "My.Custom.Test.Namespace.ClassD`21.MethodD(T01, T02, T03, T04, T05, T06, T07, T08, T09, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, Unknown)",
             "My.Custom.Test.Namespace.GenericClassC`1.GenericMethodCFromGenericClass[T01, T02, T03, T04, T05, T06, T07, T08, T09, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20](T01, T02, T03, T04, T05, T06, T07, T08, T09, T10, T11, T12, T13, T14, T15, T16, T17, T18, T19, T20, Unknown)",
             "My.Custom.Test.Namespace.GenericClassC`1.GenericMethodCFromGenericClass(T)"
-        };
+        ];
 
 #if NETFRAMEWORK || DEBUG
         stackTrace.Add("Unknown_Native_Function(unknown)");

test/IntegrationTests/Log4NetBridgeTests.cs

@@ -37,7 +37,7 @@ public void SubmitLogs_ThroughLog4NetBridge_WhenLog4NetIsUsedDirectlyForLogging(
         // Logged with exception
         collector.Expect(
             logRecord =>
-            VerifyBody(logRecord, "Exception occured") &&
+            VerifyBody(logRecord, "Exception occurred") &&
             logRecord is { SeverityText: "ERROR", SeverityNumber: SeverityNumber.Error } &&
             VerifyExceptionAttributes(logRecord) &&
             logRecord.Attributes.Count == 4,
@@ -69,7 +69,7 @@ public void SubmitLogs_ThroughILoggerBridge_WhenLog4NetIsUsedAsILoggerAppenderFo
         // Logged in scope of an activity
         collector.Expect(
             logRecord =>
-            VerifyBody(logRecord, "{0}, {1} at {2:t}!") &&
+            VerifyBody(logRecord, "{hello}, {world} at {time:t}!") &&
             VerifyTraceContext(logRecord) &&
             logRecord is { SeverityText: "Information", SeverityNumber: SeverityNumber.Info } &&
             // 0 : "Hello"
@@ -81,7 +81,7 @@ public void SubmitLogs_ThroughILoggerBridge_WhenLog4NetIsUsedAsILoggerAppenderFo
         // Logged with exception
         collector.Expect(
             logRecord =>
-            VerifyBody(logRecord, "Exception occured") &&
+            VerifyBody(logRecord, "Exception occurred") &&
             // OtlpLogExporter adds exception related attributes (ConsoleExporter doesn't show them)
             logRecord is { SeverityText: "Error", SeverityNumber: SeverityNumber.Error } &&
             VerifyExceptionAttributes(logRecord) &&
@@ -148,7 +148,7 @@ public void TraceContext_IsInjectedIntoCurrentLog4NetLogsDestination(string pack
         var regex = new Regex(@"INFO  TestApplication\.Log4NetBridge\.Program - Hello, world at \d{2}\:\d{2}\! span_id=[a-f0-9]{16} trace_id=[a-f0-9]{32} trace_flags=01");
         var output = standardOutput;
         Assert.Matches(regex, output);
-        Assert.Contains("ERROR TestApplication.Log4NetBridge.Program - Exception occured span_id=(null) trace_id=(null) trace_flags=(null)", output);
+        Assert.Contains("ERROR TestApplication.Log4NetBridge.Program - Exception occurred span_id=(null) trace_id=(null) trace_flags=(null)", output);
     }
 
     private static bool VerifyAttributes(LogRecord logRecord)
@@ -172,7 +172,7 @@ private static bool VerifyTraceContext(LogRecord logRecord)
     private static void AssertStandardOutputExpectations(string standardOutput)
     {
         Assert.Contains("INFO  TestApplication.Log4NetBridge.Program - Hello, world at", standardOutput);
-        Assert.Contains("ERROR TestApplication.Log4NetBridge.Program - Exception occured", standardOutput);
+        Assert.Contains("ERROR TestApplication.Log4NetBridge.Program - Exception occurred", standardOutput);
     }
 
     private static bool VerifyBody(LogRecord logRecord, string expectedBody)

test/IntegrationTests/MinimalApiTests.cs

@@ -55,18 +55,18 @@ public async Task SubmitsLogsWithoutDuplicates(bool enableByteCodeInstrumentatio
         collector.AssertCollected();
     }
 
-    private static bool ValidateCombinedLogsExport(IEnumerable<LogRecord> records)
+    private static bool ValidateCombinedLogsExport(ICollection<LogRecord> records)
     {
         return ValidateSingleAppLogExport(records) && ValidateSingleBeforeHostLogRecord(records);
     }
 
-    private static bool ValidateSingleBeforeHostLogRecord(IEnumerable<LogRecord> records)
+    private static bool ValidateSingleBeforeHostLogRecord(ICollection<LogRecord> records)
     {
         var beforeHostLogCount = records.Count(lr => Convert.ToString(lr.Body) == "{ \"stringValue\": \"Logged before host is built.\" }");
         return beforeHostLogCount == 1;
     }
 
-    private static bool ValidateSingleAppLogExport(IEnumerable<LogRecord> records)
+    private static bool ValidateSingleAppLogExport(ICollection<LogRecord> records)
     {
         var appLogCount = records.Count(lr => Convert.ToString(lr.Body) == "{ \"stringValue\": \"Request received.\" }");
         return appLogCount == 1;

test/IntegrationTests/NLogBridgeTests.cs

@@ -46,7 +46,7 @@ public void SubmitLogs_ThroughNLogBridge_WhenNLogIsUsedDirectlyForLogging(string
         // Logged with exception
         collector.Expect(
             logRecord =>
-            VerifyBody(logRecord, "Exception occured") &&
+            VerifyBody(logRecord, "Exception occurred") &&
             logRecord is { SeverityText: "Error", SeverityNumber: SeverityNumber.Error } &&
             VerifyExceptionAttributes(logRecord) &&
             logRecord.Attributes.Count == 3,

test/test-applications/integrations/Directory.Build.props

@@ -16,5 +16,6 @@
     <!-- CA1031: Do not catch general exception types -->
     <!-- CA1303: Do not pass literals as localized parameters -->
     <NoWarn>$(NoWarn);CA1031;CA1303</NoWarn>
+    <AnalysisLevel>latest-All</AnalysisLevel>
   </PropertyGroup>
 </Project>

test/test-applications/integrations/TestApplication.AssemblyRedirection.NetFramework/Program.cs

@@ -9,7 +9,7 @@
 var loadedAssemblyNames = new HashSet<string>();
 var hasMultipleInstancesOfSingleAssembly = false;
 var assemblies = AppDomain.CurrentDomain.GetAssemblies();
-Array.Sort<Assembly>(assemblies, (l, r) => l.FullName?.CompareTo(r.FullName) ?? -1);
+Array.Sort<Assembly>(assemblies, static (l, r) => string.CompareOrdinal(l.FullName, r.FullName));
 Console.WriteLine("Loaded assemblies:");
 foreach (var assembly in assemblies)
 {

test/test-applications/integrations/TestApplication.ContinuousProfiler.ContextTracking/Program.cs

@@ -5,11 +5,11 @@
 
 namespace TestApplication.ContinuousProfiler.ContextTracking;
 
-internal class Program
+internal static class Program
 {
     private static readonly ActivitySource Source = new ActivitySource("TestApplication.ContinuousProfiler.ContextTracking");
 
-    public static async Task Main(string[] args)
+    public static async Task Main()
     {
         Thread.CurrentThread.Name = "TestName";
         // Start an activity that remains active until async operation completes,

test/test-applications/integrations/TestApplication.ContinuousProfiler.ContextTracking/TestPlugin.cs

@@ -3,17 +3,23 @@
 
 namespace TestApplication.ContinuousProfiler.ContextTracking;
 
+#pragma warning disable CA1515 // Consider making public types internal. Needed for AutoInstrumentation plugin loading.
 public class TestPlugin
+#pragma warning restore CA1515 // Consider making public types internal Needed for AutoInstrumentation plugin loading.
 {
+#pragma warning disable CA1822 // Mark members as static. Needed for AutoInstrumentation plugin loading.
     public Tuple<bool, uint, bool, uint, TimeSpan, TimeSpan, object> GetContinuousProfilerConfiguration()
+#pragma warning restore CA1822 // Mark members as static. Needed for AutoInstrumentation plugin loading.
     {
         var threadSamplingEnabled = true;
         var threadSamplingInterval = 1000u;
         var allocationSamplingEnabled = false;
         var maxMemorySamplesPerMinute = 200u;
         var exportInterval = TimeSpan.FromMilliseconds(500);
         var exportTimeout = TimeSpan.FromSeconds(5);
+#pragma warning disable CA2000 // Dispose objects before losing scope. It should be handled by the AutoInstrumentation.
         object continuousProfilerExporter = new OtlpOverHttpExporter(TimeSpan.FromMilliseconds(threadSamplingInterval), new SampleNativeFormatParser());
+#pragma warning restore CA2000 // Dispose objects before losing scope. It should be handled by the AutoInstrumentation.
 
         return Tuple.Create(threadSamplingEnabled, threadSamplingInterval, allocationSamplingEnabled, maxMemorySamplesPerMinute, exportInterval, exportTimeout, continuousProfilerExporter);
     }

test/test-applications/integrations/TestApplication.ContinuousProfiler/ClassA.cs

@@ -1,6 +1,7 @@
 // Copyright The OpenTelemetry Authors
 // SPDX-License-Identifier: Apache-2.0
 
+using System.Globalization;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -19,7 +20,7 @@ public static void MethodA()
         var items = new List<string>();
         for (var i = 0; i < numberOfItems; i++)
         {
-            items.Add(i.ToString("D10000"));
+            items.Add(i.ToString("D10000", CultureInfo.InvariantCulture));
         }
 
         MethodABytes(
@@ -76,8 +77,8 @@ public static unsafe void MethodAFloats(
         float fl,
         double db)
     {
-        int a = 1;
-        int* pointer = &a;
+        var a = 1;
+        var pointer = &a;
         MethodAPointer(pointer);
     }
 
@@ -89,8 +90,8 @@ public static unsafe void MethodAPointer(int* pointer)
             new object(),
             new CustomClass(),
             default,
-            Array.Empty<CustomClass>(),
-            Array.Empty<CustomStruct>(),
+            [],
+            [],
             new List<string>());
     }
 
@@ -110,6 +111,7 @@ public static void MethodAOthers<T>(
         static void Action(int s) => InternalClassB<string, int>.DoubleInternalClassB.TripleInternalClassB<int>.MethodB(s, [3], TimeSpan.Zero, 0, ["a"], []);
     }
 
+    [DefaultDllImportSearchPaths(DllImportSearchPath.SafeDirectories)]
 #if NET
     [DllImport("TestApplication.ContinuousProfiler.NativeDep")]
 #else
@@ -126,7 +128,7 @@ internal static class TripleInternalClassB<T3>
                 [MethodImpl(MethodImplOptions.NoInlining)]
                 public static void MethodB<T2>(int testArg, T3[] a, T2 b, T4 t, IList<T1> c, IList<string> d)
                 {
-                    OTelAutoCallbackTest(TestCallback, testArg);
+                    _ = OTelAutoCallbackTest(TestCallback, testArg);
                 }
             }
         }

test/test-applications/integrations/TestApplication.ContinuousProfiler/CustomClass.cs

@@ -3,6 +3,4 @@
 
 namespace My.Custom.Test.Namespace;
 
-internal class CustomClass
-{
-}
+internal sealed class CustomClass;