Prepend MSTest to log messages, without formatting (#785)

There are some strings that are not correctly formatted, and the previous code was not taking that into account, but because it worked before, then EqtTrace must be protecting against that. So I just prepend MSTest, and let EqtTrace format the result
microsoft · Feb 25, 2021 · 8ac9547 · 8ac9547
1 parent 764842c
commit 8ac9547
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/Adapter/PlatformServices.Desktop/Services/DesktopAdapterTraceLogger.cs b/src/Adapter/PlatformServices.Desktop/Services/DesktopAdapterTraceLogger.cs
@@ -22,7 +22,7 @@ public void LogError(string format, params object[] args)
         {
             if (EqtTrace.IsErrorEnabled)
             {
-                EqtTrace.Error(this.PrependAdapterName(format, args));
+                EqtTrace.Error(this.PrependAdapterName(format), args);
             }
         }
 
@@ -35,7 +35,7 @@ public void LogWarning(string format, params object[] args)
         {
             if (EqtTrace.IsWarningEnabled)
             {
-                EqtTrace.Warning(this.PrependAdapterName(format, args));
+                EqtTrace.Warning(this.PrependAdapterName(format), args);
             }
         }
 
@@ -48,13 +48,13 @@ public void LogInfo(string format, params object[] args)
         {
             if (EqtTrace.IsInfoEnabled)
             {
-                EqtTrace.Info(this.PrependAdapterName(format, args));
+                EqtTrace.Info(this.PrependAdapterName(format), args);
             }
         }
 
-        private string PrependAdapterName(string format, params object[] args)
+        private string PrependAdapterName(string format)
         {
-            return string.Format($"MSTest - {string.Format(format, args)}");
+            return $"MSTest - {format}";
         }
     }
 

diff --git a/src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TraceLogger.cs b/src/Adapter/PlatformServices.Shared/netstandard1.0/Services/ns10TraceLogger.cs
@@ -22,7 +22,7 @@ public void LogError(string format, params object[] args)
         {
             if (EqtTrace.IsErrorEnabled)
             {
-                EqtTrace.Error(this.PrependAdapterName(format, args));
+                EqtTrace.Error(this.PrependAdapterName(format), args);
             }
         }
 
@@ -35,7 +35,7 @@ public void LogWarning(string format, params object[] args)
         {
             if (EqtTrace.IsWarningEnabled)
             {
-                EqtTrace.Warning(this.PrependAdapterName(format, args));
+                EqtTrace.Warning(this.PrependAdapterName(format), args);
             }
         }
 
@@ -48,13 +48,13 @@ public void LogInfo(string format, params object[] args)
         {
             if (EqtTrace.IsInfoEnabled)
             {
-                EqtTrace.Info(this.PrependAdapterName(format, args));
+                EqtTrace.Info(this.PrependAdapterName(format), args);
             }
         }
 
-        private string PrependAdapterName(string format, params object[] args)
+        private string PrependAdapterName(string format)
         {
-            return string.Format($"MSTest - {string.Format(format, args)}");
+            return $"MSTest - {format}";
         }
     }