Add EventPipe Config File Option MultiFileSec (#20548) (#20615)

Author: brianrob

src/mscorlib/src/System/Diagnostics/Eventing/EventPipe.cs

@@ -80,6 +80,7 @@ internal sealed class EventPipeConfiguration
         private uint m_circularBufferSizeInMB;
         private List<EventPipeProviderConfiguration> m_providers;
         private TimeSpan m_minTimeBetweenSamples = TimeSpan.FromMilliseconds(1);
+        private ulong m_multiFileTraceLengthInSeconds = 0;
 
         internal EventPipeConfiguration(
             string outputFile,
@@ -108,6 +109,11 @@ internal uint CircularBufferSizeInMB
             get { return m_circularBufferSizeInMB; }
         }
 
+        internal ulong MultiFileTraceLengthInSeconds
+        {
+            get { return m_multiFileTraceLengthInSeconds; }
+        }
+
         internal EventPipeProviderConfiguration[] Providers
         {
             get { return m_providers.ToArray(); }
@@ -149,6 +155,11 @@ internal void SetProfilerSamplingRate(TimeSpan minTimeBetweenSamples)
 
             m_minTimeBetweenSamples = minTimeBetweenSamples;
         }
+
+        internal void SetMultiFileTraceLength(ulong traceLengthInSeconds)
+        {
+            m_multiFileTraceLengthInSeconds = traceLengthInSeconds;
+        }
     }
 
     internal static class EventPipe
@@ -174,7 +185,8 @@ internal static void Enable(EventPipeConfiguration configuration)
                 configuration.CircularBufferSizeInMB,
                 configuration.ProfilerSamplingRateInNanoseconds,
                 providers,
-                providers.Length);
+                providers.Length,
+                configuration.MultiFileTraceLengthInSeconds);
         }
 
         internal static void Disable()
@@ -189,7 +201,7 @@ internal static class EventPipeInternal
         // These PInvokes are used by the configuration APIs to interact with EventPipe.
         //
         [DllImport(JitHelpers.QCall, CharSet = CharSet.Unicode)]
-        internal static extern UInt64 Enable(string outputFile, uint circularBufferSizeInMB, long profilerSamplingRateInNanoseconds, EventPipeProviderConfiguration[] providers, int numProviders);
+        internal static extern UInt64 Enable(string outputFile, uint circularBufferSizeInMB, long profilerSamplingRateInNanoseconds, EventPipeProviderConfiguration[] providers, int numProviders, ulong multiFileTraceLengthInSeconds);
 
         [DllImport(JitHelpers.QCall, CharSet = CharSet.Unicode)]
         internal static extern void Disable(UInt64 sessionID);

src/mscorlib/src/System/Diagnostics/Eventing/EventPipeController.cs

@@ -49,6 +49,7 @@ internal sealed class EventPipeController
         private const string ConfigKey_CircularMB = "CircularMB";
         private const string ConfigKey_OutputPath = "OutputPath";
         private const string ConfigKey_ProcessID = "ProcessID";
+        private const string ConfigKey_MultiFileSec = "MultiFileSec";
 
         // The default set of providers/keywords/levels.  Used if an alternative configuration is not specified.
         private static readonly EventPipeProviderConfiguration[] DefaultProviderConfiguration = new EventPipeProviderConfiguration[]
@@ -160,6 +161,7 @@ private static EventPipeConfiguration BuildConfigFromFile(string configFilePath)
             string strProviderConfig = null;
             string strCircularMB = null;
             string strProcessID = null;
+            string strMultiFileSec = null;
 
             // Split the configuration entries by line.
             string[] configEntries = strConfigContents.Split(ConfigFileLineDelimiters, StringSplitOptions.RemoveEmptyEntries);
@@ -186,6 +188,10 @@ private static EventPipeConfiguration BuildConfigFromFile(string configFilePath)
                     {
                         strProcessID = entryComponents[1];
                     }
+                    else if (key.Equals(ConfigKey_MultiFileSec))
+                    {
+                        strMultiFileSec = entryComponents[1];
+                    }
                 }
             }
 
@@ -206,6 +212,13 @@ private static EventPipeConfiguration BuildConfigFromFile(string configFilePath)
                 throw new ArgumentNullException(nameof(outputPath));
             }
 
+            // Check to see if MultiFileSec is specified.
+            ulong multiFileSec = 0;
+            if (!string.IsNullOrEmpty(strMultiFileSec))
+            {
+                multiFileSec = Convert.ToUInt64(strMultiFileSec);
+            }
+
             // Build the full path to the trace file.
             string traceFileName = BuildTraceFileName();
             string outputFile = Path.Combine(outputPath, traceFileName);
@@ -219,6 +232,7 @@ private static EventPipeConfiguration BuildConfigFromFile(string configFilePath)
 
             // Initialize a new configuration object.
             EventPipeConfiguration config = new EventPipeConfiguration(outputFile, circularMB);
+            config.SetMultiFileTraceLength(multiFileSec);
 
             // Set the provider configuration if specified.
             if (!string.IsNullOrEmpty(strProviderConfig))

src/mscorlib/src/System/Diagnostics/Eventing/EventPipeEventDispatcher.cs

@@ -110,7 +110,7 @@ private void CommitDispatchConfiguration()
                 new EventPipeProviderConfiguration(RuntimeEventSource.EventSourceName, (ulong) aggregatedKeywords, (uint) highestLevel)
             };
 
-            m_sessionID = EventPipeInternal.Enable(null, 1024, 1, providerConfiguration, 1);
+            m_sessionID = EventPipeInternal.Enable(null, 1024, 1, providerConfiguration, 1, 0);
             Debug.Assert(m_sessionID != 0);
 
             // Get the session information that is required to properly dispatch events.