Skip to content

Commit 892d9a3

Browse files
KielekKielek
authored
Enable Roslyn analysis - main project - part II (#4688)
* Mute CA1024 * Mute CA1031 * Disable CA1032 * CA1064 * IDE0300 * IDE0017 * IDE0280 * IDE0074 * scope var * IDE0003 * IDE0007
1 parent c94b67a commit 892d9a3

File tree

60 files changed

+479
-499
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+479
-499
lines changed

‎src/OpenTelemetry.AutoInstrumentation/CallTarget/CallTargetInvokerException.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@
33

44
namespace OpenTelemetry.AutoInstrumentation.CallTarget;
55

6+
#pragma warning disable CA1032 // Implement standard exception constructors
7+
#pragma warning disable CA1064 // Exceptions should be public. This exception is intended for internal use only.
68
internal class CallTargetInvokerException : Exception
9+
#pragma warning restore CA1064 // Exceptions should be public. This exception is intended for internal use only.
10+
#pragma warning restore CA1032 // Implement standard exception constructors
711
{
812
public CallTargetInvokerException(Exception innerException)
913
: base(innerException.Message, innerException)

‎src/OpenTelemetry.AutoInstrumentation/CallTarget/CallTargetReturn.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ public CallTargetReturn(T returnValue)
3030
/// </summary>
3131
/// <returns>Default call target return value</returns>
3232
[MethodImpl(MethodImplOptions.AggressiveInlining)]
33+
#pragma warning disable CA1024 // Use properties where appropriate
3334
public static CallTargetReturn<T> GetDefault()
35+
#pragma warning restore CA1024 // Use properties where appropriate
3436
{
3537
return default;
3638
}
@@ -40,7 +42,9 @@ public static CallTargetReturn<T> GetDefault()
4042
/// </summary>
4143
/// <returns>Return value</returns>
4244
[MethodImpl(MethodImplOptions.AggressiveInlining)]
45+
#pragma warning disable CA1024 // Use properties where appropriate
4346
public T GetReturnValue() => _returnValue;
47+
#pragma warning restore CA1024 // Use properties where appropriate
4448

4549
/// <summary>
4650
/// ToString override
@@ -64,7 +68,9 @@ public readonly ref struct CallTargetReturn
6468
/// </summary>
6569
/// <returns>Default call target return value</returns>
6670
[MethodImpl(MethodImplOptions.AggressiveInlining)]
71+
#pragma warning disable CA1024 // Use properties where appropriate
6772
public static CallTargetReturn GetDefault()
73+
#pragma warning restore CA1024 // Use properties where appropriate
6874
{
6975
return default;
7076
}

‎src/OpenTelemetry.AutoInstrumentation/CallTarget/CallTargetState.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@ internal CallTargetState(Activity? previousActivity, CallTargetState state)
8585
/// </summary>
8686
/// <returns>Default call target state</returns>
8787
[MethodImpl(MethodImplOptions.AggressiveInlining)]
88+
#pragma warning disable CA1024 // Use properties where appropriate
8889
public static CallTargetState GetDefault()
90+
#pragma warning restore CA1024 // Use properties where appropriate
8991
{
9092
return default;
9193
}

‎src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/BeginMethodHandler.cs‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
using System.Diagnostics;
5-
using System.Reflection.Emit;
65
using System.Runtime.CompilerServices;
76

87
#pragma warning disable SA1649 // File name must match first type name
@@ -17,7 +16,7 @@ static BeginMethodHandler()
1716
{
1817
try
1918
{
20-
DynamicMethod? dynMethod = IntegrationMapper.CreateBeginMethodDelegate(typeof(TIntegration), typeof(TTarget), Array.Empty<Type>());
19+
var dynMethod = IntegrationMapper.CreateBeginMethodDelegate(typeof(TIntegration), typeof(TTarget), []);
2120
if (dynMethod != null)
2221
{
2322
_invokeDelegate = (InvokeDelegate)dynMethod.CreateDelegate(typeof(InvokeDelegate));
@@ -29,10 +28,7 @@ static BeginMethodHandler()
2928
}
3029
finally
3130
{
32-
if (_invokeDelegate is null)
33-
{
34-
_invokeDelegate = instance => CallTargetState.GetDefault();
35-
}
31+
_invokeDelegate ??= instance => CallTargetState.GetDefault();
3632
}
3733
}
3834

‎src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/BeginMethodHandler`1.cs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
using System.Diagnostics;
5-
using System.Reflection.Emit;
65
using System.Runtime.CompilerServices;
76

87
#pragma warning disable SA1649 // File name must match first type name
@@ -17,8 +16,8 @@ static BeginMethodHandler()
1716
{
1817
try
1918
{
20-
Type tArg1ByRef = typeof(TArg1).IsByRef ? typeof(TArg1) : typeof(TArg1).MakeByRefType();
21-
DynamicMethod? dynMethod = IntegrationMapper.CreateBeginMethodDelegate(typeof(TIntegration), typeof(TTarget), new[] { tArg1ByRef });
19+
var tArg1ByRef = typeof(TArg1).IsByRef ? typeof(TArg1) : typeof(TArg1).MakeByRefType();
20+
var dynMethod = IntegrationMapper.CreateBeginMethodDelegate(typeof(TIntegration), typeof(TTarget), [tArg1ByRef]);
2221
if (dynMethod != null)
2322
{
2423
_invokeDelegate = (InvokeDelegate)dynMethod.CreateDelegate(typeof(InvokeDelegate));
@@ -30,10 +29,7 @@ static BeginMethodHandler()
3029
}
3130
finally
3231
{
33-
if (_invokeDelegate is null)
34-
{
35-
_invokeDelegate = (TTarget instance, ref TArg1 arg1) => CallTargetState.GetDefault();
36-
}
32+
_invokeDelegate ??= (TTarget instance, ref TArg1 arg1) => CallTargetState.GetDefault();
3733
}
3834
}
3935

‎src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/BeginMethodHandler`2.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
using System.Diagnostics;
5-
using System.Reflection.Emit;
65
using System.Runtime.CompilerServices;
76

87
#pragma warning disable SA1649 // File name must match first type name
@@ -17,9 +16,9 @@ static BeginMethodHandler()
1716
{
1817
try
1918
{
20-
Type tArg1ByRef = typeof(TArg1).IsByRef ? typeof(TArg1) : typeof(TArg1).MakeByRefType();
21-
Type tArg2ByRef = typeof(TArg2).IsByRef ? typeof(TArg2) : typeof(TArg2).MakeByRefType();
22-
DynamicMethod? dynMethod = IntegrationMapper.CreateBeginMethodDelegate(typeof(TIntegration), typeof(TTarget), new[] { tArg1ByRef, tArg2ByRef });
19+
var tArg1ByRef = typeof(TArg1).IsByRef ? typeof(TArg1) : typeof(TArg1).MakeByRefType();
20+
var tArg2ByRef = typeof(TArg2).IsByRef ? typeof(TArg2) : typeof(TArg2).MakeByRefType();
21+
var dynMethod = IntegrationMapper.CreateBeginMethodDelegate(typeof(TIntegration), typeof(TTarget), [tArg1ByRef, tArg2ByRef]);
2322
if (dynMethod != null)
2423
{
2524
_invokeDelegate = (InvokeDelegate)dynMethod.CreateDelegate(typeof(InvokeDelegate));
@@ -31,10 +30,7 @@ static BeginMethodHandler()
3130
}
3231
finally
3332
{
34-
if (_invokeDelegate is null)
35-
{
36-
_invokeDelegate = (TTarget instance, ref TArg1 arg1, ref TArg2 arg2) => CallTargetState.GetDefault();
37-
}
33+
_invokeDelegate ??= (TTarget instance, ref TArg1 arg1, ref TArg2 arg2) => CallTargetState.GetDefault();
3834
}
3935
}
4036

‎src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/BeginMethodHandler`3.cs‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
using System.Diagnostics;
5-
using System.Reflection.Emit;
65
using System.Runtime.CompilerServices;
76

87
#pragma warning disable SA1649 // File name must match first type name
@@ -17,10 +16,10 @@ static BeginMethodHandler()
1716
{
1817
try
1918
{
20-
Type tArg1ByRef = typeof(TArg1).IsByRef ? typeof(TArg1) : typeof(TArg1).MakeByRefType();
21-
Type tArg2ByRef = typeof(TArg2).IsByRef ? typeof(TArg2) : typeof(TArg2).MakeByRefType();
22-
Type tArg3ByRef = typeof(TArg3).IsByRef ? typeof(TArg3) : typeof(TArg3).MakeByRefType();
23-
DynamicMethod? dynMethod = IntegrationMapper.CreateBeginMethodDelegate(typeof(TIntegration), typeof(TTarget), new[] { tArg1ByRef, tArg2ByRef, tArg3ByRef });
19+
var tArg1ByRef = typeof(TArg1).IsByRef ? typeof(TArg1) : typeof(TArg1).MakeByRefType();
20+
var tArg2ByRef = typeof(TArg2).IsByRef ? typeof(TArg2) : typeof(TArg2).MakeByRefType();
21+
var tArg3ByRef = typeof(TArg3).IsByRef ? typeof(TArg3) : typeof(TArg3).MakeByRefType();
22+
var dynMethod = IntegrationMapper.CreateBeginMethodDelegate(typeof(TIntegration), typeof(TTarget), [tArg1ByRef, tArg2ByRef, tArg3ByRef]);
2423
if (dynMethod != null)
2524
{
2625
_invokeDelegate = (InvokeDelegate)dynMethod.CreateDelegate(typeof(InvokeDelegate));
@@ -32,10 +31,7 @@ static BeginMethodHandler()
3231
}
3332
finally
3433
{
35-
if (_invokeDelegate is null)
36-
{
37-
_invokeDelegate = (TTarget instance, ref TArg1 arg1, ref TArg2 arg2, ref TArg3 arg3) => CallTargetState.GetDefault();
38-
}
34+
_invokeDelegate ??= (TTarget instance, ref TArg1 arg1, ref TArg2 arg2, ref TArg3 arg3) => CallTargetState.GetDefault();
3935
}
4036
}
4137

‎src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/BeginMethodHandler`4.cs‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
using System.Diagnostics;
5-
using System.Reflection.Emit;
65
using System.Runtime.CompilerServices;
76

87
#pragma warning disable SA1649 // File name must match first type name
@@ -17,11 +16,11 @@ static BeginMethodHandler()
1716
{
1817
try
1918
{
20-
Type tArg1ByRef = typeof(TArg1).IsByRef ? typeof(TArg1) : typeof(TArg1).MakeByRefType();
21-
Type tArg2ByRef = typeof(TArg2).IsByRef ? typeof(TArg2) : typeof(TArg2).MakeByRefType();
22-
Type tArg3ByRef = typeof(TArg3).IsByRef ? typeof(TArg3) : typeof(TArg3).MakeByRefType();
23-
Type tArg4ByRef = typeof(TArg4).IsByRef ? typeof(TArg4) : typeof(TArg4).MakeByRefType();
24-
DynamicMethod? dynMethod = IntegrationMapper.CreateBeginMethodDelegate(typeof(TIntegration), typeof(TTarget), new[] { tArg1ByRef, tArg2ByRef, tArg3ByRef, tArg4ByRef });
19+
var tArg1ByRef = typeof(TArg1).IsByRef ? typeof(TArg1) : typeof(TArg1).MakeByRefType();
20+
var tArg2ByRef = typeof(TArg2).IsByRef ? typeof(TArg2) : typeof(TArg2).MakeByRefType();
21+
var tArg3ByRef = typeof(TArg3).IsByRef ? typeof(TArg3) : typeof(TArg3).MakeByRefType();
22+
var tArg4ByRef = typeof(TArg4).IsByRef ? typeof(TArg4) : typeof(TArg4).MakeByRefType();
23+
var dynMethod = IntegrationMapper.CreateBeginMethodDelegate(typeof(TIntegration), typeof(TTarget), [tArg1ByRef, tArg2ByRef, tArg3ByRef, tArg4ByRef]);
2524
if (dynMethod != null)
2625
{
2726
_invokeDelegate = (InvokeDelegate)dynMethod.CreateDelegate(typeof(InvokeDelegate));
@@ -33,10 +32,7 @@ static BeginMethodHandler()
3332
}
3433
finally
3534
{
36-
if (_invokeDelegate is null)
37-
{
38-
_invokeDelegate = (TTarget instance, ref TArg1 arg1, ref TArg2 arg2, ref TArg3 arg3, ref TArg4 arg4) => CallTargetState.GetDefault();
39-
}
35+
_invokeDelegate ??= (TTarget instance, ref TArg1 arg1, ref TArg2 arg2, ref TArg3 arg3, ref TArg4 arg4) => CallTargetState.GetDefault();
4036
}
4137
}
4238

‎src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/BeginMethodHandler`5.cs‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
using System.Diagnostics;
5-
using System.Reflection.Emit;
65
using System.Runtime.CompilerServices;
76

87
#pragma warning disable SA1649 // File name must match first type name
@@ -17,12 +16,12 @@ static BeginMethodHandler()
1716
{
1817
try
1918
{
20-
Type tArg1ByRef = typeof(TArg1).IsByRef ? typeof(TArg1) : typeof(TArg1).MakeByRefType();
21-
Type tArg2ByRef = typeof(TArg2).IsByRef ? typeof(TArg2) : typeof(TArg2).MakeByRefType();
22-
Type tArg3ByRef = typeof(TArg3).IsByRef ? typeof(TArg3) : typeof(TArg3).MakeByRefType();
23-
Type tArg4ByRef = typeof(TArg4).IsByRef ? typeof(TArg4) : typeof(TArg4).MakeByRefType();
24-
Type tArg5ByRef = typeof(TArg5).IsByRef ? typeof(TArg5) : typeof(TArg5).MakeByRefType();
25-
DynamicMethod? dynMethod = IntegrationMapper.CreateBeginMethodDelegate(typeof(TIntegration), typeof(TTarget), new[] { tArg1ByRef, tArg2ByRef, tArg3ByRef, tArg4ByRef, tArg5ByRef });
19+
var tArg1ByRef = typeof(TArg1).IsByRef ? typeof(TArg1) : typeof(TArg1).MakeByRefType();
20+
var tArg2ByRef = typeof(TArg2).IsByRef ? typeof(TArg2) : typeof(TArg2).MakeByRefType();
21+
var tArg3ByRef = typeof(TArg3).IsByRef ? typeof(TArg3) : typeof(TArg3).MakeByRefType();
22+
var tArg4ByRef = typeof(TArg4).IsByRef ? typeof(TArg4) : typeof(TArg4).MakeByRefType();
23+
var tArg5ByRef = typeof(TArg5).IsByRef ? typeof(TArg5) : typeof(TArg5).MakeByRefType();
24+
var dynMethod = IntegrationMapper.CreateBeginMethodDelegate(typeof(TIntegration), typeof(TTarget), [tArg1ByRef, tArg2ByRef, tArg3ByRef, tArg4ByRef, tArg5ByRef]);
2625
if (dynMethod != null)
2726
{
2827
_invokeDelegate = (InvokeDelegate)dynMethod.CreateDelegate(typeof(InvokeDelegate));
@@ -34,10 +33,8 @@ static BeginMethodHandler()
3433
}
3534
finally
3635
{
37-
if (_invokeDelegate is null)
38-
{
39-
_invokeDelegate = (TTarget instance, ref TArg1 arg1, ref TArg2 arg2, ref TArg3 arg3, ref TArg4 arg4, ref TArg5 arg5) => CallTargetState.GetDefault();
40-
}
36+
_invokeDelegate ??=
37+
(TTarget instance, ref TArg1 arg1, ref TArg2 arg2, ref TArg3 arg3, ref TArg4 arg4, ref TArg5 arg5) => CallTargetState.GetDefault();
4138
}
4239
}
4340

‎src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/BeginMethodHandler`6.cs‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// SPDX-License-Identifier: Apache-2.0
33

44
using System.Diagnostics;
5-
using System.Reflection.Emit;
65
using System.Runtime.CompilerServices;
76

87
#pragma warning disable SA1649 // File name must match first type name
@@ -17,13 +16,13 @@ static BeginMethodHandler()
1716
{
1817
try
1918
{
20-
Type tArg1ByRef = typeof(TArg1).IsByRef ? typeof(TArg1) : typeof(TArg1).MakeByRefType();
21-
Type tArg2ByRef = typeof(TArg2).IsByRef ? typeof(TArg2) : typeof(TArg2).MakeByRefType();
22-
Type tArg3ByRef = typeof(TArg3).IsByRef ? typeof(TArg3) : typeof(TArg3).MakeByRefType();
23-
Type tArg4ByRef = typeof(TArg4).IsByRef ? typeof(TArg4) : typeof(TArg4).MakeByRefType();
24-
Type tArg5ByRef = typeof(TArg5).IsByRef ? typeof(TArg5) : typeof(TArg5).MakeByRefType();
25-
Type tArg6ByRef = typeof(TArg6).IsByRef ? typeof(TArg6) : typeof(TArg6).MakeByRefType();
26-
DynamicMethod? dynMethod = IntegrationMapper.CreateBeginMethodDelegate(typeof(TIntegration), typeof(TTarget), new[] { tArg1ByRef, tArg2ByRef, tArg3ByRef, tArg4ByRef, tArg5ByRef, tArg6ByRef });
19+
var tArg1ByRef = typeof(TArg1).IsByRef ? typeof(TArg1) : typeof(TArg1).MakeByRefType();
20+
var tArg2ByRef = typeof(TArg2).IsByRef ? typeof(TArg2) : typeof(TArg2).MakeByRefType();
21+
var tArg3ByRef = typeof(TArg3).IsByRef ? typeof(TArg3) : typeof(TArg3).MakeByRefType();
22+
var tArg4ByRef = typeof(TArg4).IsByRef ? typeof(TArg4) : typeof(TArg4).MakeByRefType();
23+
var tArg5ByRef = typeof(TArg5).IsByRef ? typeof(TArg5) : typeof(TArg5).MakeByRefType();
24+
var tArg6ByRef = typeof(TArg6).IsByRef ? typeof(TArg6) : typeof(TArg6).MakeByRefType();
25+
var dynMethod = IntegrationMapper.CreateBeginMethodDelegate(typeof(TIntegration), typeof(TTarget), [tArg1ByRef, tArg2ByRef, tArg3ByRef, tArg4ByRef, tArg5ByRef, tArg6ByRef]);
2726
if (dynMethod != null)
2827
{
2928
_invokeDelegate = (InvokeDelegate)dynMethod.CreateDelegate(typeof(InvokeDelegate));
@@ -35,10 +34,7 @@ static BeginMethodHandler()
3534
}
3635
finally
3736
{
38-
if (_invokeDelegate is null)
39-
{
40-
_invokeDelegate = (TTarget instance, ref TArg1 arg1, ref TArg2 arg2, ref TArg3 arg3, ref TArg4 arg4, ref TArg5 arg5, ref TArg6 arg6) => CallTargetState.GetDefault();
41-
}
37+
_invokeDelegate ??= (TTarget instance, ref TArg1 arg1, ref TArg2 arg2, ref TArg3 arg3, ref TArg4 arg4, ref TArg5 arg5, ref TArg6 arg6) => CallTargetState.GetDefault();
4238
}
4339
}
4440

0 commit comments

Comments
 (0)