Merge branch 'main' into NetFX-Stack-Capture

Author: Kielek

src/OpenTelemetry.AutoInstrumentation/CallTarget/CallTargetInvoker.cs

@@ -318,7 +318,9 @@ public static CallTargetReturn EndMethod<TIntegration, TTarget>(TTarget instance
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static void LogException<TIntegration, TTarget>(Exception exception)
     {
+#pragma warning disable CA1062 // Validate arguments of public methods. The method in intended to use only with our internal code.
         IntegrationOptions<TIntegration, TTarget>.LogException(exception);
+#pragma warning restore CA1062 // Validate arguments of public methods. The method in intended to use only with our internal code.
     }
 
     /// <summary>

src/OpenTelemetry.AutoInstrumentation/CallTarget/CallTargetReturn.cs

@@ -31,7 +31,9 @@ public CallTargetReturn(T returnValue)
     /// <returns>Default call target return value</returns>
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
 #pragma warning disable CA1024 // Use properties where appropriate
+#pragma warning disable CA1000 // Do not declare static members on generic types, needed for bytecode instrumentation
     public static CallTargetReturn<T> GetDefault()
+#pragma warning restore CA1000 // Do not declare static members on generic types, needed for bytecode instrumentation
 #pragma warning restore CA1024 // Use properties where appropriate
     {
         return default;

src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/Continuations/ContinuationsHelper.cs

@@ -38,22 +38,22 @@ internal static TTo Convert<TFrom, TTo>(TFrom value)
 
     private static class Converter<TFrom, TTo>
     {
-        private static readonly ConvertDelegate _converter;
+        private static readonly ConvertDelegate Instance = CreateConverter();
 
-        static Converter()
+        private delegate TTo ConvertDelegate(TFrom value);
+
+        public static TTo Convert(TFrom value)
+        {
+            return Instance(value);
+        }
+
+        private static ConvertDelegate CreateConverter()
         {
             var dMethod = new DynamicMethod($"Converter<{typeof(TFrom).Name},{typeof(TTo).Name}>", typeof(TTo), [typeof(TFrom)], typeof(ConvertDelegate).Module, true);
             var il = dMethod.GetILGenerator();
             il.Emit(OpCodes.Ldarg_0);
             il.Emit(OpCodes.Ret);
-            _converter = (ConvertDelegate)dMethod.CreateDelegate(typeof(ConvertDelegate));
-        }
-
-        private delegate TTo ConvertDelegate(TFrom value);
-
-        public static TTo Convert(TFrom value)
-        {
-            return _converter(value);
+            return (ConvertDelegate)dMethod.CreateDelegate(typeof(ConvertDelegate));
         }
     }
 #endif

src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/Continuations/TaskContinuationGenerator`1.cs

@@ -60,7 +60,9 @@ static TaskContinuationGenerator()
 
         if (previousTask.Status == TaskStatus.RanToCompletion)
         {
+#pragma warning disable CA1849 // 'Task<TResult>.Result' synchronously blocks. Use await instead. It is fine, as we already checked the task is completed.
             taskResult = previousTask.Result;
+#pragma warning restore CA1849 // 'Task<TResult>.Result' synchronously blocks. Use await instead. It is fine, as we already checked the task is completed.
         }
         else if (previousTask.Status == TaskStatus.Faulted)
         {

src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator.cs

@@ -35,8 +35,8 @@ static ValueTaskContinuationGenerator()
         }
 
         var previousValueTask = FromTReturn<ValueTask>(returnValue);
-
-        return ToTReturn(InnerSetValueTaskContinuation(instance, previousValueTask, state));
+        var continuationValueTask = InnerSetValueTaskContinuation(instance, previousValueTask, state);
+        return ToTReturn(continuationValueTask);
 
         static async ValueTask InnerSetValueTaskContinuation(TTarget instance, ValueTask previousValueTask, CallTargetState state)
         {

src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator`1.cs

@@ -37,7 +37,8 @@ static ValueTaskContinuationGenerator()
         }
 
         var previousValueTask = FromTReturn<ValueTask<TResult>>(returnValue);
-        return ToTReturn(InnerSetValueTaskContinuation(instance, previousValueTask, state));
+        var continuationValueTask = InnerSetValueTaskContinuation(instance, previousValueTask, state);
+        return ToTReturn(continuationValueTask);
 
         static async ValueTask<TResult?> InnerSetValueTaskContinuation(TTarget instance, ValueTask<TResult> previousValueTask, CallTargetState state)
         {

src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/IntegrationMapper.cs

@@ -180,7 +180,7 @@ internal class IntegrationMapper
         }
 
         // Call method
-        onMethodBeginMethodInfo = onMethodBeginMethodInfo.MakeGenericMethod(callGenericTypes.ToArray());
+        onMethodBeginMethodInfo = onMethodBeginMethodInfo.MakeGenericMethod([.. callGenericTypes]);
         ilWriter.EmitCall(OpCodes.Call, onMethodBeginMethodInfo, null);
         ilWriter.Emit(OpCodes.Ret);
 
@@ -307,7 +307,7 @@ internal class IntegrationMapper
         }
 
         // Call method
-        onMethodBeginMethodInfo = onMethodBeginMethodInfo.MakeGenericMethod(callGenericTypes.ToArray());
+        onMethodBeginMethodInfo = onMethodBeginMethodInfo.MakeGenericMethod([.. callGenericTypes]);
         ilWriter.EmitCall(OpCodes.Call, onMethodBeginMethodInfo, null);
         ilWriter.Emit(OpCodes.Ret);
 
@@ -421,7 +421,7 @@ internal class IntegrationMapper
         }
 
         // Call Method
-        onMethodEndMethodInfo = onMethodEndMethodInfo.MakeGenericMethod(callGenericTypes.ToArray());
+        onMethodEndMethodInfo = onMethodEndMethodInfo.MakeGenericMethod([.. callGenericTypes]);
         ilWriter.EmitCall(OpCodes.Call, onMethodEndMethodInfo, null);
 
         ilWriter.Emit(OpCodes.Ret);
@@ -572,7 +572,7 @@ internal class IntegrationMapper
         }
 
         // Call Method
-        onMethodEndMethodInfo = onMethodEndMethodInfo.MakeGenericMethod(callGenericTypes.ToArray());
+        onMethodEndMethodInfo = onMethodEndMethodInfo.MakeGenericMethod([.. callGenericTypes]);
         ilWriter.EmitCall(OpCodes.Call, onMethodEndMethodInfo, null);
 
         // Unwrap return value proxy
@@ -737,7 +737,7 @@ internal static CreateAsyncEndMethodResult CreateAsyncEndMethodDelegate(Type int
         }
 
         // Call Method
-        onAsyncMethodEndMethodInfo = onAsyncMethodEndMethodInfo.MakeGenericMethod(callGenericTypes.ToArray());
+        onAsyncMethodEndMethodInfo = onAsyncMethodEndMethodInfo.MakeGenericMethod([.. callGenericTypes]);
         ilWriter.EmitCall(OpCodes.Call, onAsyncMethodEndMethodInfo, null);
 
         // Unwrap return value proxy

src/OpenTelemetry.AutoInstrumentation/Configurations/EnvironmentConfigurationMetricHelper.cs

@@ -67,7 +67,7 @@ public static MeterProviderBuilder UseEnvironmentVariables(
         // Should be called later if dependency listeners are already setup.
         builder
             .SetExporter(settings, pluginManager)
-            .AddMeter(settings.Meters.ToArray());
+            .AddMeter([.. settings.Meters]);
 
         return builder;
     }

src/OpenTelemetry.AutoInstrumentation/Configurations/EnvironmentConfigurationSource.cs

@@ -20,7 +20,7 @@ public EnvironmentConfigurationSource(bool failFast)
         {
             return Environment.GetEnvironmentVariable(key);
         }
-        catch
+        catch (Exception)
         {
             // We should not add a dependency from the Configuration system to the Logger system,
             // so do nothing

src/OpenTelemetry.AutoInstrumentation/Configurations/EnvironmentConfigurationTracerHelper.cs

@@ -73,7 +73,7 @@ public static TracerProviderBuilder UseEnvironmentVariables(
             builder = builder.SetSampler(settings.Sampler);
         }
 
-        builder = builder.AddSource(settings.ActivitySources.ToArray());
+        builder = builder.AddSource([.. settings.ActivitySources]);
 
         foreach (var legacySource in settings.AdditionalLegacySources)
         {