Resolve PR comments

microsoft · Dec 13, 2024 · 76ba9c3 · 76ba9c3
1 parent 048153c
commit 76ba9c3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/dev-proxy/Logging/ProxyConsoleFormatter.cs b/dev-proxy/Logging/ProxyConsoleFormatter.cs
@@ -48,7 +48,9 @@ private void LogRequest(RequestLog requestLog, string category, IExternalScopePr
 
         // don't log intercepted response to console
         if (messageType == MessageType.InterceptedResponse ||
-            (messageType == MessageType.Skipped && !_options.ShowSkipMessages))
+            (messageType == MessageType.Skipped && !_options.ShowSkipMessages) ||
+                (messageType == MessageType.Timestamp && !_options.ShowTimestamps)
+            )
         {
             return;
         }

diff --git a/dev-proxy/Logging/ProxyConsoleFormatterOptions.cs b/dev-proxy/Logging/ProxyConsoleFormatterOptions.cs
@@ -9,5 +9,5 @@ public class ProxyConsoleFormatterOptions: ConsoleFormatterOptions
 {
     public bool ShowSkipMessages { get; set; } = true;
 
-    public bool ShowTimestamps { get; set; } = false;
+    public bool ShowTimestamps { get; set; } = true;
 }
diff --git a/dev-proxy/ProxyEngine.cs b/dev-proxy/ProxyEngine.cs
@@ -475,16 +475,13 @@ async Task OnRequestAsync(object sender, SessionEventArgs e)
                 await e.GetRequestBodyAsString();
             }
 
-            using var scope = _logger?.BeginScope(e.HttpClient.Request.Method ?? "", e.HttpClient.Request.Url, e.GetHashCode());
+            using var scope = _logger.BeginScope(e.HttpClient.Request.Method ?? "", e.HttpClient.Request.Url, e.GetHashCode());
 
             e.UserData = e.HttpClient.Request;
 
-            _logger?.LogRequest($"{e.HttpClient.Request.Method} {e.HttpClient.Request.Url}", MessageType.InterceptedRequest, new LoggingContext(e));
+            _logger.LogRequest($"{e.HttpClient.Request.Method} {e.HttpClient.Request.Url}", MessageType.InterceptedRequest, new LoggingContext(e));
 
-            if (_config.ShowTimestamps)
-            {
-                _logger?.LogRequest($"{DateTimeOffset.UtcNow}", MessageType.Timestamp, new LoggingContext(e));
-            }
+            _logger.LogRequest($"{DateTimeOffset.UtcNow}", MessageType.Timestamp, new LoggingContext(e));
 
             await HandleRequestAsync(e, proxyRequestArgs);
         }