Merge branch 'main' into fix/sqlclient-firstspan-lost

benchmarks/Sentry.Benchmarks/BreadcrumbOverheadBenchmarks.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using BenchmarkDotNet.Attributes;
-using Sentry.Protocol;
 
 namespace Sentry.Benchmarks
 {

samples/Sentry.Samples.AspNetCore.Blazor.Wasm/Program.cs

@@ -26,7 +26,7 @@ public static async Task Main(string[] args)
                 // Captures logError and higher as events
                 builder.Logging.AddSentry(o => o.InitializeSdk = false);
 
-                builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
+                builder.Services.AddScoped(_ => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
 
                 await builder.Build().RunAsync();
             }

samples/Sentry.Samples.AspNetCore.Grpc/Program.cs

@@ -3,7 +3,6 @@
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Microsoft.Extensions.DependencyInjection;
 using Sentry.AspNetCore;
 using Sentry.AspNetCore.Grpc;
 

samples/Sentry.Samples.AspNetCore.Mvc/Program.cs

@@ -2,7 +2,6 @@
 using System.Net;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Hosting;
-using Sentry;
 
 namespace Samples.AspNetCore.Mvc
 {

samples/Sentry.Samples.AspNetCore.Mvc/SpecialExceptionProcessor.cs

@@ -1,6 +1,5 @@
 using Sentry;
 using Sentry.Extensibility;
-using Sentry.Protocol;
 
 namespace Samples.AspNetCore.Mvc
 {

samples/Sentry.Samples.AspNetCore.Serilog/Program.cs

@@ -16,7 +16,7 @@ public class Program
         public static IWebHost BuildWebHost(string[] args) =>
             WebHost.CreateDefaultBuilder(args)
 
-                .UseSerilog((h, c) =>
+                .UseSerilog((_, c) =>
                     c.Enrich.FromLogContext()
                     .MinimumLevel.Debug()
                     .WriteTo.Console()

samples/Sentry.Samples.Console.Customized/Program.cs

@@ -5,7 +5,6 @@
 using System.Xml.Xsl;
 using Sentry;
 using Sentry.Extensibility;
-using Sentry.Protocol;
 
 // One of the ways to set your DSN is via an attribute:
 // It could be set via AssemblyInfo.cs and patched via CI.
@@ -98,7 +97,7 @@ await SentrySdk.ConfigureScopeAsync(async scope =>
             // Example customizing the HttpClientHandlers created
             o.CreateHttpClientHandler = () => new HttpClientHandler
             {
-                ServerCertificateCustomValidationCallback = (sender, certificate, chain, sslPolicyErrors) =>
+                ServerCertificateCustomValidationCallback = (_, certificate, _, _) =>
                     !certificate.Archived
             };
 

samples/Sentry.Samples.EntityFramework/Program.cs

@@ -1,9 +1,7 @@
 using System.ComponentModel.DataAnnotations;
-using System.Configuration;
 using System.Data.Common;
 using System.Data.Entity;
 using Sentry;
-using Sentry.EntityFramework;
 
 var _ = SentrySdk.Init(o =>
 {

samples/Sentry.Samples.GenericHost/Program.cs

@@ -17,7 +17,7 @@ public static Task Main()
                 c.SetBasePath(Directory.GetCurrentDirectory());
                 c.AddJsonFile("appsettings.json", optional: false);
             })
-            .ConfigureServices((c, s) => { s.AddHostedService<SampleHostedService>(); })
+            .ConfigureServices((_, s) => { s.AddHostedService<SampleHostedService>(); })
             .ConfigureLogging((c, l) =>
             {
                 l.AddConfiguration(c.Configuration);

src/Sentry.AspNet/Internal/SystemWebRequestEventProcessor.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Security.Claims;
 using System.Web;
 using Sentry.Extensibility;

src/Sentry.AspNet/SentryAspNetOptionsExtensions.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Web;
 using Sentry.AspNet.Internal;
 using Sentry.Extensibility;

src/Sentry.AspNetCore.Grpc/SentryBuilderExtensions.cs

@@ -1,6 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using Sentry.Extensibility;
-using Sentry.Protocol;
 using Sentry.Reflection;
 
 namespace Sentry.AspNetCore.Grpc

src/Sentry.AspNetCore/DefaultUserFactory.cs

@@ -1,6 +1,5 @@
 using System.Security.Claims;
 using Microsoft.AspNetCore.Http;
-using Sentry.Protocol;
 
 namespace Sentry.AspNetCore
 {

src/Sentry.AspNetCore/IUserFactory.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Http;
-using Sentry.Protocol;
 
 namespace Sentry.AspNetCore
 {

src/Sentry.AspNetCore/ScopeExtensions.cs

@@ -9,7 +9,6 @@
 using Microsoft.Net.Http.Headers;
 using Sentry.AspNetCore.Extensions;
 using Sentry.Extensibility;
-using Sentry.Protocol;
 
 namespace Sentry.AspNetCore
 {

src/Sentry.DiagnosticSource/Internals/DiagnosticSource/SentryEFCoreListener.cs

@@ -142,7 +142,7 @@ public void OnNext(KeyValuePair<string, object?> value)
         /// </summary>
         /// <example>
         /// Compiling query model:
-        /// EF intialize...\r\nEF Query...
+        /// EF initialize...\r\nEF Query...
         /// becomes:
         /// EF Query...
         /// </example>

src/Sentry.Extensions.Logging/LogLevelExtensions.cs

@@ -1,5 +1,4 @@
 using Microsoft.Extensions.Logging;
-using Sentry.Protocol;
 
 namespace Sentry.Extensions.Logging
 {

src/Sentry.Extensions.Logging/SentryLoggerFactoryExtensions.cs

@@ -4,7 +4,6 @@
 using Sentry.Extensibility;
 using Sentry.Extensions.Logging;
 using Sentry.Infrastructure;
-using Sentry.Internal;
 
 // ReSharper disable once CheckNamespace
 // Ensures 'AddSentry' can be found without: 'using Sentry;'

src/Sentry.Extensions.Logging/SentryLoggerProvider.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Sentry.Infrastructure;

src/Sentry.Extensions.Logging/SentryLoggingOptions.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Linq;
 using Microsoft.Extensions.Logging;
-using Sentry.Protocol;
 
 namespace Sentry.Extensions.Logging
 {

src/Sentry.Log4Net/SentryAppender.cs

@@ -3,7 +3,6 @@
 using log4net.Appender;
 using log4net.Core;
 using Sentry.Extensibility;
-using Sentry.Protocol;
 using Sentry.Reflection;
 
 namespace Sentry.Log4Net

src/Sentry.NLog/LogLevelExtensions.cs

@@ -1,7 +1,5 @@
 using NLog;
 
-using Sentry.Protocol;
-
 namespace Sentry.NLog
 {
     internal static class LogLevelExtensions

src/Sentry.NLog/SentryTarget.cs

@@ -10,7 +10,6 @@
 
 using Sentry.Extensibility;
 using Sentry.Infrastructure;
-using Sentry.Protocol;
 using Sentry.Reflection;
 
 namespace Sentry.NLog

src/Sentry.Serilog/LogLevelExtensions.cs

@@ -1,4 +1,3 @@
-using Sentry.Protocol;
 using Serilog.Events;
 
 namespace Sentry.Serilog

src/Sentry.Serilog/SentrySerilogOptions.cs

@@ -1,5 +1,4 @@
 using System;
-using Sentry.Protocol;
 using Serilog.Events;
 using Serilog.Formatting;
 

src/Sentry.Serilog/SentrySink.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text;
 using Sentry.Extensibility;
 using Sentry.Infrastructure;
-using Sentry.Protocol;
 using Sentry.Reflection;
 using Serilog.Core;
 using Serilog.Events;

src/Sentry.Tunnel/SentryTunnelMiddleware.cs

@@ -9,7 +9,6 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Net.Http.Headers;
 
 namespace Sentry.Tunnel
 {

src/Sentry/IScopeObserver.cs

@@ -1,5 +1,3 @@
-using System.Collections.Generic;
-
 namespace Sentry
 {
     /// <summary>

src/Sentry/ISentryClient.cs

@@ -32,7 +32,7 @@ public interface ISentryClient
         /// </summary>
         /// <remarks>
         /// Note: this method is NOT meant to be called from user code!
-        /// Instead, call <see cref="ISpan.Finish(Sentry.SpanStatus)"/> on the transaction.
+        /// Instead, call <see cref="ISpan.Finish(SpanStatus)"/> on the transaction.
         /// </remarks>
         /// <param name="transaction">The transaction.</param>
         void CaptureTransaction(Transaction transaction);

src/Sentry/Infrastructure/SystemClock.cs

@@ -5,7 +5,7 @@ namespace Sentry.Infrastructure
     /// <summary>
     /// Implementation of <see cref="ISystemClock"/> to help testability.
     /// </summary>
-    /// <seealso cref="Sentry.Infrastructure.ISystemClock" />
+    /// <seealso cref="ISystemClock" />
     public sealed class SystemClock : ISystemClock
     {
         /// <summary>

src/Sentry/Infrastructure/TraceDiagnosticLogger.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using Sentry.Extensibility;
 namespace Sentry.Infrastructure

src/Sentry/Integrations/TaskUnobservedTaskExceptionIntegration.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Runtime.ExceptionServices;
 using System.Security;
 using System.Threading.Tasks;

src/Sentry/Internal/Hub.cs

@@ -304,7 +304,7 @@ public SentryId CaptureEvent(SentryEvent evt, Scope? scope = null)
 
                 actualScope.SessionUpdate = evt switch
                 {
-                    // TODO: Extract both braches as internal extension methods (IsCrashed and IsErrored):
+                    // TODO: Extract both branches as internal extension methods (IsCrashed and IsErrored):
 
                     // Event contains a terminal exception -> end session as crashed
                     var e when e.SentryExceptions?.Any(x => !(x.Mechanism?.Handled ?? true)) ?? false =>

src/Sentry/Internal/ProcessInfo.cs

@@ -1,9 +1,7 @@
 using System;
 using System.Diagnostics;
-using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Sentry.Extensibility;
-using Sentry.PlatformAbstractions;
 
 namespace Sentry.Internal
 {

src/Sentry/PlatformAbstractions/RuntimeInfo.cs

@@ -102,7 +102,7 @@ internal static void SetNetCoreVersion(Runtime runtime)
 
         internal static Runtime? GetFromRuntimeInformation()
         {
-            // Prefered API: netstandard2.0
+            // Preferred API: netstandard2.0
             // https://github.com/dotnet/corefx/blob/master/src/System.Runtime.InteropServices.RuntimeInformation/src/System/Runtime/InteropServices/RuntimeInformation/RuntimeInformation.cs
             // https://github.com/mono/mono/blob/90b49aa3aebb594e0409341f9dca63b74f9df52e/mcs/class/corlib/System.Runtime.InteropServices.RuntimeInformation/RuntimeInformation.cs
             // e.g: .NET Framework 4.7.2633.0, .NET Native, WebAssembly

src/Sentry/Scope.cs

@@ -100,7 +100,7 @@ public Contexts Contexts
         }
 
         // Internal for testing.
-        internal Action<User?> UserChanged => (user) =>
+        internal Action<User?> UserChanged => user =>
         {
             if (Options.EnableScopeSync &&
                 Options.ScopeObserver is { } observer)

src/Sentry/Span.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Text.Json;
 using Sentry.Internal.Extensions;
 

test/Sentry.AspNet.Tests/Properties/AssemblyInfo.cs

@@ -0,0 +1,9 @@
+
+// This file is used by Code Analysis to maintain SuppressMessage 
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given 
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("Style", "IDE1006:Naming Styles", Justification = "Test project")]

test/Sentry.AspNetCore.Tests/SentryHttpMessageHandlerBuilderFilterTests.cs

@@ -1,9 +1,7 @@
 #if NET5_0 || NETCOREAPP3_1
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
-using System.Threading;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Microsoft.AspNetCore.Builder;

test/Sentry.AspNetCore.Tests/SentryTracingMiddlewareTests.cs

@@ -306,7 +306,7 @@ public async Task Transaction_binds_exception_thrown()
                 .Configure(app =>
                 {
                     app.UseRouting();
-                    app.Use(async (r, c) =>
+                    app.Use(async (_, c) =>
                     {
                         try
                         {