Fix merge issue

dotnet · Jan 20, 2024 · c53eed4 · c53eed4
1 parent 58983c8
commit c53eed4
Showing 1 changed file with 9 additions and 10 deletions.
diff --git a/...e/Def/Telemetry/TimedTelemetryLogBlock.cs → ...elemetry/Shared/TimedTelemetryLogBlock.cs b/...e/Def/Telemetry/TimedTelemetryLogBlock.cs → ...elemetry/Shared/TimedTelemetryLogBlock.cs
@@ -15,12 +15,12 @@ namespace Microsoft.CodeAnalysis.Telemetry
     /// </summary>
     internal sealed class TimedTelemetryLogBlock : IDisposable
     {
+#pragma warning disable IDE0052 // Remove unread private members - Not used in debug builds
         private readonly KeyValueLogMessage _logMessage;
         private readonly int _minThresholdMs;
-#pragma warning disable IDE0052 // Remove unread private members - Not used in debug builds
         private readonly ITelemetryLog _telemetryLog;
-#pragma warning restore IDE0052 // Remove unread private members
         private readonly SharedStopwatch _stopwatch;
+#pragma warning restore IDE0052 // Remove unread private members
 
         public TimedTelemetryLogBlock(KeyValueLogMessage logMessage, int minThresholdMs, ITelemetryLog telemetryLog)
         {
@@ -32,6 +32,11 @@ public TimedTelemetryLogBlock(KeyValueLogMessage logMessage, int minThresholdMs,
 
         public void Dispose()
         {
+            // Don't add elapsed information in debug bits or while under debugger.
+#if !DEBUG
+            if (Debugger.IsAttached)
+                return;
+
             var elapsed = (int)_stopwatch.Elapsed.TotalMilliseconds;
             if (elapsed >= _minThresholdMs)
             {
@@ -42,15 +47,9 @@ public void Dispose()
                     m.AddRange(_logMessage.Properties);
                 });
 
-#if !DEBUG
-                // Don't skew telemetry results by logging in debug bits or under debugger.
-                if (!Debugger.IsAttached)
-                    _telemetryLog.Log(logMessage);
-#endif
-                logMessage.Free();
+                _telemetryLog.Log(logMessage);
             }
-
-            _logMessage.Free();
+#endif
         }
     }
 }