review changes

src/Directory.Build.props

@@ -42,6 +42,7 @@
     <AzureCoreVersion>1.24.0</AzureCoreVersion>
     <AzureIdentityVersion>1.6.0</AzureIdentityVersion>
     <MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
+    <MicrosoftDiagnosticsNETCoreClientVersion>0.2.421201</MicrosoftDiagnosticsNETCoreClientVersion>
     <MicrosoftNETCorePortableCompatibilityVersion>1.0.1</MicrosoftNETCorePortableCompatibilityVersion>
     <MicrosoftIdentityClientVersion>4.39.0</MicrosoftIdentityClientVersion>
     <MicrosoftIdentityClientExtensionsMsalVersion>2.19.3</MicrosoftIdentityClientExtensionsMsalVersion>

src/TraceEvent/TraceEvent.Tests/Parsing/EventPipeParsing.cs

@@ -1,18 +1,14 @@
 using FastSerialization;
 using Microsoft.Diagnostics.Tracing;
-using Microsoft.Diagnostics.Tracing.AutomatedAnalysis;
 using Microsoft.Diagnostics.Tracing.Etlx;
 using Microsoft.Diagnostics.Tracing.EventPipe;
 using Microsoft.Diagnostics.Tracing.Parsers;
 using Microsoft.Diagnostics.Tracing.Parsers.Clr;
-using Microsoft.Diagnostics.Tracing.Parsers.Kernel;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Diagnostics.Tracing;
 using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices;
 using System.Text;
 using Xunit;
 using Xunit.Abstractions;

src/TraceEvent/TraceEvent.csproj

@@ -44,8 +44,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="0.2.421201" />
     <PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="$(MicrosoftNETCorePortableCompatibilityVersion)" />
+    <PackageReference Include="Microsoft.Diagnostics.NETCore.Client" Version="$(MicrosoftDiagnosticsNETCoreClientVersion)" />
     <PackageReference Include="Microsoft.Diagnostics.Tracing.TraceEvent.SupportFiles" Version="$(MicrosoftDiagnosticsTracingTraceEventSupportFilesVersion)" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
     <PackageReference Include="System.Diagnostics.Process" Version="$(SystemDiagnosticsProcessVersion)" />

src/TraceEvent/TraceLog.cs

@@ -204,34 +204,12 @@ public static TraceLogEventSource CreateFromTraceEventSession(TraceEventSession
         /// </example>
         public static TraceLogEventSource CreateFromEventPipeSession(EventPipeSession session, EventPipeSession rundownSession = null)
         {
-            var tlEventSource = CreateFromEventPipeEventSource(new EventPipeEventSource(session.EventStream));
+            var traceLog = new TraceLog(new EventPipeEventSource(session.EventStream));
+            traceLog.rawEventSourceToConvert.AllEvents += traceLog.OnAllEventPipeEventsRealTime;
 
             if (rundownSession != null)
             {
-                tlEventSource.TraceLog.ProcessInitialRundown(rundownSession);
-            }
-
-            return tlEventSource;
-        }
-
-        /// <summary>
-        /// From a EventPipeEventSource, create a real time TraceLog Event Source. Like an EventPipeEventSource a TraceLogEventSource
-        /// will deliver events in real time. However an TraceLogEventSource has an underlying Tracelog (which you can access with
-        /// the .Log Property) which lets you get at aggregated information (Processes, threads, images loaded, and perhaps most
-        /// importantly TraceEvent.CallStack() will work. Thus you can get real time stacks from events).
-        /// </summary>
-        /// <param name="rundownSource">
-        /// If given, the rundownSource is used to initialize module and method information.
-        /// This only makes sense in realtime sessions when you need to resolve function names.
-        /// </param>
-        public static TraceLogEventSource CreateFromEventPipeEventSource(EventPipeEventSource source, EventPipeSession rundownSource = null)
-        {
-            var traceLog = new TraceLog(source);
-            traceLog.rawEventSourceToConvert.AllEvents += traceLog.onAllEventPipeEventsRealTime;
-
-            if (rundownSource != null)
-            {
-                traceLog.ProcessInitialRundown(rundownSource);
+                traceLog.ProcessInitialRundown(rundownSession);
             }
 
             return traceLog.realTimeSource;
@@ -258,12 +236,6 @@ private void ProcessInitialRundown(EventPipeSession session)
             }
         }
 
-        private void ProcessInitialRundown(EventPipeEventSource source)
-        {
-            SetupInitialRundownCallbacks(source);
-            source.Process();
-        }
-
         /// <summary>
         /// Attaches callbacks to initialize modules and methods based on the rundown events.
         /// Unlike SetupCallbacks(), these callbacks are attached before any events are processed so
@@ -334,7 +306,7 @@ private void SetupInitialRundownCallbacks(EventPipeEventSource rawEvents)
             };
         }
 
-        private unsafe void onAllEventPipeEventsRealTime(TraceEvent data)
+        private unsafe void OnAllEventPipeEventsRealTime(TraceEvent data)
         {
             TraceEventCounts countForEvent = Stats.GetEventCounts(data);
             // Debug.Assert((int)data.EventIndex == eventCount);
@@ -1284,6 +1256,8 @@ private unsafe void SetupCallbacks(TraceEventDispatcher rawEvents)
             jsJittedMethods = new List<MethodLoadUnloadJSTraceData>();
             sourceFilesByID = new Dictionary<JavaScriptSourceKey, string>();
 
+            // We need to copy some information from the event source.
+            // An EventPipeEventSource won't have headers set until Process() is called, so we wait for the event trigger instead of copying right away.
             if (rawEvents is EventPipeEventSource eventPipeEventSource)
             {
                 eventPipeEventSource.HeadersDeserialized += delegate () { CopyHeadersFrom(rawEvents); };