declutter StackGuard.Guard traces

src/Compiler/Facilities/DiagnosticsLogger.fs

@@ -875,17 +875,17 @@ type StackGuard(maxDepth: int, name: string) =
             [<CallerFilePath; Optional; DefaultParameterValue("")>] path: string,
             [<CallerLineNumber; Optional; DefaultParameterValue(0)>] line: int
         ) =
-        use _ =
-            Activity.start
-                "DiagnosticsLogger.StackGuard.Guard"
-                [|
-                    Activity.Tags.stackGuardName, name
-                    Activity.Tags.stackGuardCurrentDepth, string depth
-                    Activity.Tags.stackGuardMaxDepth, string maxDepth
-                    Activity.Tags.callerMemberName, memberName
-                    Activity.Tags.callerFilePath, path
-                    Activity.Tags.callerLineNumber, string line
-                |]
+
+        Activity.logEvent
+            "DiagnosticsLogger.StackGuard.Guard"
+            [|
+                Activity.Tags.stackGuardName, name
+                Activity.Tags.stackGuardCurrentDepth, string depth
+                Activity.Tags.stackGuardMaxDepth, string maxDepth
+                Activity.Tags.callerMemberName, memberName
+                Activity.Tags.callerFilePath, path
+                Activity.Tags.callerLineNumber, string line
+            |]
 
         depth <- depth + 1
 

src/Compiler/Utilities/Activity.fs

@@ -7,6 +7,7 @@ open System.Diagnostics
 open System.IO
 open System.Text
 open Internal.Utilities.Library
+open System.Collections.Generic
 
 
 module ActivityNames =
@@ -102,12 +103,17 @@ module internal Activity =
 
     let startNoTags (name: string) : IDisposable = activitySource.StartActivity name
 
-    let addEvent name =
+    let logEvent name (tags: (string * obj) seq) =
         match Activity.Current with
         | null -> ()
-        | activity when activity.Source = activitySource -> activity.AddEvent(ActivityEvent name) |> ignore
+        | activity when activity.Source = activitySource ->
+            let collection = tags |> Seq.map KeyValuePair |> ActivityTagsCollection
+            let event = new ActivityEvent(name, tags = collection)
+            activity.AddEvent event |> ignore
         | _ -> ()
 
+    let addEvent name = logEvent name Seq.empty
+
     module Profiling =
 
         module Tags =

src/Compiler/Utilities/Activity.fsi

@@ -45,6 +45,8 @@ module internal Activity =
 
     val addEvent: name: string -> unit
 
+    val logEvent: name: string -> tags: (string * obj) seq -> unit
+
     module Profiling =
         val startAndMeasureEnvironmentStats: name: string -> IDisposable
         val addConsoleListener: unit -> IDisposable