Merge pull request #54236 from dotnet/merges/main-to-main-vs-deps

Merge main to main-vs-deps
dotnet · Jun 20, 2021 · 77d2dfa · 77d2dfa
2 parents ead5ec8 + 0985b4d
commit 77d2dfa
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/VisualStudio/Core/Def/Telemetry/VSTelemetryLogger.cs b/src/VisualStudio/Core/Def/Telemetry/VSTelemetryLogger.cs
@@ -29,7 +29,7 @@ public bool IsEnabled(FunctionId functionId)
 
         public void Log(FunctionId functionId, LogMessage logMessage)
         {
-            if (logMessage.LogLevel < LogLevel.Information)
+            if (IgnoreMessage(logMessage))
             {
                 return;
             }
@@ -53,6 +53,11 @@ public void Log(FunctionId functionId, LogMessage logMessage)
 
         public void LogBlockStart(FunctionId functionId, LogMessage logMessage, int blockId, CancellationToken cancellationToken)
         {
+            if (IgnoreMessage(logMessage))
+            {
+                return;
+            }
+
             try
             {
                 // guard us from exception thrown by telemetry
@@ -67,6 +72,11 @@ public void LogBlockStart(FunctionId functionId, LogMessage logMessage, int bloc
 
         public void LogBlockEnd(FunctionId functionId, LogMessage logMessage, int blockId, int delta, CancellationToken cancellationToken)
         {
+            if (IgnoreMessage(logMessage))
+            {
+                return;
+            }
+
             try
             {
                 // guard us from exception thrown by telemetry
@@ -89,6 +99,9 @@ public void LogBlockEnd(FunctionId functionId, LogMessage logMessage, int blockI
             }
         }
 
+        private static bool IgnoreMessage(LogMessage logMessage)
+            => logMessage.LogLevel < LogLevel.Information;
+
         private static LogType GetKind(LogMessage logMessage)
             => logMessage is KeyValueLogMessage kvLogMessage
                                 ? kvLogMessage.Kind