add fix

Author: adamsitnik

src/TraceEvent/Stacks/ChromiumStackSourceWriter.cs

@@ -55,8 +55,10 @@ private static void WriteToFile(Dictionary<int, FrameInfo> frameIdToFrameTuple,
             IReadOnlyDictionary<ThreadInfo, IReadOnlyList<ProfileEvent>> sortedProfileEventsPerThread,
             TextWriter writer, string name)
         {
+            Dictionary<string, string> escapedNames = new Dictionary<string, string>();
+
             writer.Write("{");
-            writer.Write($"\"otherData\": {{ \"name\": \"{name}\", \"exporter\": \"{GetExporterInfo()}\" }}, ");
+            writer.Write($"\"otherData\": {{ \"name\": \"{GetEscaped(name, escapedNames)}\", \"exporter\": \"{GetExporterInfo()}\" }}, ");
             writer.Write("\"traceEvents\": [");
             bool isFirst = true;
             foreach (var perThread in sortedProfileEventsPerThread.OrderBy(pair => pair.Value.First().RelativeTime))
@@ -69,7 +71,7 @@ private static void WriteToFile(Dictionary<int, FrameInfo> frameIdToFrameTuple,
                         isFirst = false;
 
                     writer.Write("{");
-                    writer.Write($"\"name\": \"{frameIdToFrameTuple[profileEvent.FrameId].Name}\", ");
+                    writer.Write($"\"name\": \"{GetEscaped(frameIdToFrameTuple[profileEvent.FrameId].Name, escapedNames)}\", ");
                     writer.Write($"\"cat\": \"sampleEvent\", ");
                     writer.Write($"\"ph\": \"{(profileEvent.Type == ProfileEventType.Open ? "B" : "E")}\", ");
                     writer.Write($"\"ts\": {profileEvent.RelativeTime.ToString("R", CultureInfo.InvariantCulture)}, ");
@@ -93,7 +95,7 @@ private static void WriteToFile(Dictionary<int, FrameInfo> frameIdToFrameTuple,
                 var frameId = frame.Key;
                 var frameInfo = frame.Value;
                 writer.Write($"\"{frameId}\": {{");
-                writer.Write($"\"name\": \"{frameInfo.Name}\", ");
+                writer.Write($"\"name\": \"{GetEscaped(frameInfo.Name, escapedNames)}\", ");
                 writer.Write($"\"category\": \"{frameInfo.Category}\"");
                 if (frameInfo.ParentId != -1)
                     writer.Write($", \"parent\": {frameInfo.ParentId}");

src/TraceEvent/Stacks/SpeedScopeStackSourceWriter.cs

@@ -52,16 +52,18 @@ private static void Export(StackSource source, TextWriter writer, string name)
         private static void WriteToFile(IReadOnlyDictionary<string, IReadOnlyList<ProfileEvent>> sortedProfileEventsPerThread,
             IReadOnlyList<string> orderedFrameNames, TextWriter writer, string name)
         {
+            Dictionary<string, string> escapedNames = new Dictionary<string, string>();
+
             writer.Write("{");
             writer.Write($"\"exporter\": \"{GetExporterInfo()}\", ");
-            writer.Write($"\"name\": \"{name}\", ");
+            writer.Write($"\"name\": \"{GetEscaped(name, escapedNames)}\", ");
             writer.Write("\"activeProfileIndex\": 0, ");
             writer.Write("\"$schema\": \"https://www.speedscope.app/file-format-schema.json\", ");
 
             writer.Write("\"shared\": { \"frames\": [ ");
             for (int i = 0; i < orderedFrameNames.Count; i++)
             {
-                writer.Write($"{{ \"name\": \"{orderedFrameNames[i].Replace("\\", "\\\\").Replace("\"", "\\\"")}\" }}");
+                writer.Write($"{{ \"name\": \"{GetEscaped(orderedFrameNames[i], escapedNames)}\" }}");
 
                 if (i != orderedFrameNames.Count - 1)
                     writer.Write(", ");
@@ -82,7 +84,7 @@ private static void WriteToFile(IReadOnlyDictionary<string, IReadOnlyList<Profil
 
                 writer.Write("{ ");
                 writer.Write("\"type\": \"evented\", ");
-                writer.Write($"\"name\": \"{perThread.Key}\", ");
+                writer.Write($"\"name\": \"{GetEscaped(perThread.Key, escapedNames)}\", ");
                 writer.Write("\"unit\": \"milliseconds\", ");
                 writer.Write($"\"startValue\": {sortedProfileEvents.First().RelativeTime.ToString("R", CultureInfo.InvariantCulture)}, ");
                 writer.Write($"\"endValue\": {sortedProfileEvents.Last().RelativeTime.ToString("R", CultureInfo.InvariantCulture)}, ");

src/TraceEvent/Stacks/StackSourceWriterHelper.cs

@@ -228,6 +228,25 @@ internal static string GetExporterInfo()
             return $"{traceEvent.Name}@{traceEvent.Version}"; // sth like "Microsoft.Diagnostics.Tracing.TraceEvent@2.0.56.0"
         }
 
+        internal static string GetEscaped(string name, Dictionary<string, string> escapedNames)
+        {
+            if (!escapedNames.TryGetValue(name, out string escaped))
+            {
+#if NETSTANDARD1_6 || DEBUG // the Debug check allows us to test this code path for other TFMs
+                // System.Web.HttpUtility.JavaScriptStringEncode is not part of the .NET Standard 1.6
+                // but it's part of .NET 4.0+. So we just use reflection to invoke it.
+                escaped = escapedNames[name] = (string)Type
+                    .GetType("System.Web.HttpUtility, System.Web, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")
+                    .GetMethod("JavaScriptStringEncode", new Type[1] { typeof(string) })
+                    .Invoke(null, new object[] { name });
+#elif NETSTANDARD2_0 || NET45
+                escaped = escapedNames[name] = System.Web.HttpUtility.JavaScriptStringEncode(name);
+#endif
+            }
+
+            return escaped;
+        }
+
         private static int CompareSamplesByTime(Sample x, Sample y)
         {
             int timeComparison = x.RelativeTime.CompareTo(y.RelativeTime);

src/TraceEvent/TraceEvent.csproj

@@ -61,6 +61,7 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Net.Http" />
+    <Reference Include="System.Web" />
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
   </ItemGroup>