ref: review fixes

Author: bruno-garcia

src/Sentry/Extensibility/DiagnosticLoggerExtensions.cs

@@ -17,7 +17,7 @@ public static void LogDebug<TArg, TArg2>(
             string message,
             TArg arg,
             TArg2 arg2)
-        => logger.LogIfEnabled(SentryLevel.Debug, message, arg, arg2);
+            => logger.LogIfEnabled(SentryLevel.Debug, message, arg, arg2);
 
         public static void LogDebug(
             this IDiagnosticLogger logger,
@@ -40,7 +40,7 @@ public static void LogInfo<TArg, TArg2>(
             string message,
             TArg arg,
             TArg2 arg2)
-        => logger.LogIfEnabled(SentryLevel.Info, message, arg, arg2);
+            => logger.LogIfEnabled(SentryLevel.Info, message, arg, arg2);
 
         public static void LogWarning(
             this IDiagnosticLogger logger,

src/Sentry/Extensibility/RequestBodyExtractionDispatcher.cs

@@ -31,7 +31,7 @@ public object ExtractPayload(IHttpRequest request)
                 case RequestSize.Small when request.ContentLength < 1_000:
                 case RequestSize.Medium when request.ContentLength < 10_000:
                 case RequestSize.Always:
-                    _options.DiagnosticLogger.LogDebug("Attempting to read request body of size: {0}, configured max: {1}.",
+                    _options.DiagnosticLogger?.LogDebug("Attempting to read request body of size: {0}, configured max: {1}.",
                         request.ContentLength, size);
 
                     foreach (var extractor in Extractors)
@@ -50,14 +50,13 @@ public object ExtractPayload(IHttpRequest request)
                     break;
                 // Request body extraction is opt-in
                 case RequestSize.None:
-                    _options.DiagnosticLogger.LogDebug("Skipping request body extraction.");
-                    break;
-                default:
-                    _options.DiagnosticLogger.LogWarning("Ignoring request with Size {0} and configuration RequestSize {1}",
-                        request.ContentLength, size);
+                    _options.DiagnosticLogger?.LogDebug("Skipping request body extraction.");
                     break;
             }
 
+            _options.DiagnosticLogger?.LogWarning("Ignoring request with Size {0} and configuration RequestSize {1}",
+                request.ContentLength, size);
+
             return null;
         }
     }

src/Sentry/Internal/Web/SystemWebRequestEventProcessor.cs

@@ -34,7 +34,6 @@ public SentryEvent Process(SentryEvent @event)
 
             foreach (var key in context.Request.Headers.AllKeys)
             {
-
                 if (!_options.SendDefaultPii
                     // Don't add headers which might contain PII
                     && (key == "Cookie"
@@ -47,6 +46,13 @@ public SentryEvent Process(SentryEvent @event)
 
             if (_options?.SendDefaultPii == true)
             {
+                if (@event.User.Username == Environment.UserName)
+                {
+                    // if SendDefaultPii is true, Sentry SDK will send the current logged on user
+                    // which doesn't make sense in a server apps
+                    @event.User.Username = null;
+                }
+
                 @event.User.IpAddress = context.Request.UserHostAddress;
                 if (context.User.Identity is IIdentity identity)
                 {
@@ -79,14 +85,7 @@ public SentryEvent Process(SentryEvent @event)
             {
                 @event.Contexts["server-os"] = os;
             }
-
-            if (_options?.SendDefaultPii == true && @event.User.Username == Environment.UserName)
-            {
-                // if SendDefaultPii is true, Sentry SDK will send the current logged on user
-                // which doesn't make sense in a server apps
-                @event.User.Username = null;
-            }
-
+            
             var body = PayloadExtractor.ExtractPayload(new SystemWebHttpRequest(context.Request));
             if (body != null)
             {