[EventPipe] Handle EventPipe Enable calls during shutdown (#105842)

dotnet · Aug 6, 2024 · 50d6cad · 50d6cad
1 parent 6cdc448
commit 50d6cad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/coreclr/vm/eventpipeinternal.cpp b/src/coreclr/vm/eventpipeinternal.cpp
@@ -44,7 +44,10 @@ extern "C" UINT64 QCALLTYPE EventPipeInternal_Enable(
             nullptr,
             nullptr,
             nullptr);
-        EventPipeAdapter::StartStreaming(sessionID);
+        if (sessionID != 0)
+        {
+            EventPipeAdapter::StartStreaming(sessionID);
+        }
     }
     END_QCALL;
 

diff --git a/...braries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventPipeEventDispatcher.cs b/...braries/System.Private.CoreLib/src/System/Diagnostics/Tracing/EventPipeEventDispatcher.cs
@@ -104,7 +104,7 @@ private void CommitDispatchConfiguration()
             ulong sessionID = EventPipeInternal.Enable(null, EventPipeSerializationFormat.NetTrace, DefaultEventListenerCircularMBSize, providerConfiguration);
             if (sessionID == 0)
             {
-                throw new EventSourceException(SR.EventSource_CouldNotEnableEventPipe);
+                return;
             }
 
             // Get the session information that is required to properly dispatch events.