From 8c6900f6e9ff5316b85b466fdeba27429aa36a31 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneq@yandex.ru>
Date: Sun, 15 Mar 2026 20:17:13 +0300
Subject: [PATCH 01/53] Some warnings fixes

---
 .../Components/CaseInfo/CaseInfo.razor        |  2 +-
 .../Canvas/Graph/AggregatedDataRenderer.razor |  5 -----
 .../Canvas/Graph/GraphRenderer.razor          |  4 ++--
 .../ColorsLog/ColorsEventLogRenderer.razor    |  3 +--
 .../ContextValues/ColorsLog/Slidebar.razor    |  4 ++--
 .../PipelinePartResultsRenderer.razor         | 10 ++++-----
 .../Components/SidebarList/Keys.cs            |  8 +++++++
 .../Components/SidebarList/SidebarList.razor  |  8 +++----
 .../FicusDashboard/Layout/MainLayout.razor    |  4 ++--
 .../FicusDashboard/Utils/UserData.cs          | 13 ++++-------
 .../PipelinePartsContextValuesService.cs      |  3 +--
 .../PipelinePartsUpdateKafkaSettings.cs       |  4 ++--
 .../Core/CommandLine/ProcfilerException.cs    | 10 ---------
 Procfiler/src/dotnet/Core/Core.csproj         |  4 ----
 .../Core/Events/EventRecord/EventRecord.cs    |  2 +-
 .../EventRecord/EventRecordExtensions.cs      | 22 +++----------------
 .../Core/MetadataKeysWithTransform.cs         |  3 ---
 .../InplaceMutators/BusinessEventMutator.cs   |  2 +-
 .../IDllMethodsPatcher.cs                     | 10 +++------
 .../dotnet/Core/Ocel/MethodOcelLogWriter.cs   |  6 +++++
 .../Split/SplitEventsByMethodCommand.cs       | 12 +++++-----
 .../Split/SplitEventsHelper.cs                |  3 +--
 22 files changed, 51 insertions(+), 91 deletions(-)
 create mode 100644 Ficus/src/front/FicusFrontend/FicusDashboard/Components/SidebarList/Keys.cs

diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/CaseInfo.razor b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/CaseInfo.razor
index 5b15a0f1f..a34e1041c 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/CaseInfo.razor
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/CaseInfo.razor
@@ -53,7 +53,7 @@
     <PipelinePartResultsRenderer Results="results"
                                  Lifetime="myCurrentLifetime"
                                  Index="index"
-                                 ProcessCaseData="myProcessCaseData"/>
+                                 ProcessCaseData="myProcessCaseData!"/>
   }
 </div>
 
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/Graph/AggregatedDataRenderer.razor b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/Graph/AggregatedDataRenderer.razor
index aaca5ab83..83d7e4948 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/Graph/AggregatedDataRenderer.razor
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/Graph/AggregatedDataRenderer.razor
@@ -22,7 +22,6 @@
   private class AggregatedStatDto
   {
     public required string Title { get; init; }
-    public required double Value { get; init; }
     public required string ValueStringRepresentation { get; init; }
 
     public string? Units { get; init; }
@@ -49,7 +48,6 @@
 
       return new AggregatedStatDto
       {
-        Value = value,
         Title = CreateAggregatedStatTitle(counter.Key, counter.Value),
         ValueStringRepresentation = value.ToString(CultureInfo.InvariantCulture),
         Units = counter.Value.Units,
@@ -66,7 +64,6 @@
 
       return new AggregatedStatDto
       {
-        Value = value,
         Title = CreateAggregatedStatTitle(histogram.Key, histogram.Value),
         ValueStringRepresentation = value.ToString(CultureInfo.InvariantCulture),
         Units = histogram.Value.Units,
@@ -80,7 +77,6 @@
       var value = duration.Value.Value.Value;
       return new AggregatedStatDto
       {
-        Value = value,
         Title = CreateAggregatedStatTitle(duration.Key, duration.Value),
         ValueStringRepresentation = value.ToString(CultureInfo.InvariantCulture),
         Units = duration.Value.Units
@@ -92,7 +88,6 @@
     new()
     {
       Title = "Execution Time",
-      Value = Data.TotalExecutionTimeNs,
       ValueStringRepresentation = TimeSpan.FromTicks((long)Math.Ceiling(Data.TotalExecutionTimeNs / TimeSpan.NanosecondsPerTick)).ToString("c"),
       Units = string.Empty
     }
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/Graph/GraphRenderer.razor b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/Graph/GraphRenderer.razor
index e135f2c65..54b2f76ae 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/Graph/GraphRenderer.razor
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/Graph/GraphRenderer.razor
@@ -19,8 +19,8 @@
     <div class="visible-scroll" style="height: 100%; flex-grow: 1; padding: 5px; overflow-x: scroll; overflow-y: auto;">
       @if (mySettings is { RenderDagLcsInFlamegraphMode: true })
       {
-        <FlamegraphGraphRenderer Context="@myContext"
-                                 AggregatedData="myAggregatedData"
+        <FlamegraphGraphRenderer Context="@(myContext!)"
+                                 AggregatedData="myAggregatedData!"
                                  Annotation="Annotation"
                                  OcelAnnotation="OcelModelAnnotation"
                                  Settings="mySettings"/>
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/ColorsLog/ColorsEventLogRenderer.razor b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/ColorsLog/ColorsEventLogRenderer.razor
index cc4f4d8f6..0f158c0bb 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/ColorsLog/ColorsEventLogRenderer.razor
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/ColorsLog/ColorsEventLogRenderer.razor
@@ -1,5 +1,4 @@
-@using BlazorBootstrap
-@using Ficus
+@using Ficus
 @using FicusDashboard.Components.Utils
 
 @inject IJSRuntime Js;
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/ColorsLog/Slidebar.razor b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/ColorsLog/Slidebar.razor
index 29b9f23fb..ac3a5013f 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/ColorsLog/Slidebar.razor
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/ColorsLog/Slidebar.razor
@@ -18,8 +18,8 @@
 
 @code
 {
-  [Parameter] public TValue InitialValue { get; set; }
-  [Parameter] public string Title { get; set; }
+  [Parameter] public required TValue InitialValue { get; set; }
+  [Parameter] public required string Title { get; set; }
   [Parameter] public decimal Max { get; set; }
   [Parameter] public decimal Min { get; set; }
   [Parameter] public decimal Step { get; set; }
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/PipelinePartResultsRenderer.razor b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/PipelinePartResultsRenderer.razor
index 0aec8891a..bd9310da0 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/PipelinePartResultsRenderer.razor
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/PipelinePartResultsRenderer.razor
@@ -7,6 +7,7 @@
 @using FicusDashboard.Components.CaseInfo.ContextValues.Canvas.PetriNet
 @using FicusDashboard.Components.CaseInfo.ContextValues.Canvas.Graph
 @using FicusDashboard.Components.CaseInfo.ContextValues
+@using FicusDashboard.Components.SidebarList
 @using FicusDashboard.Components.Utils
 @using FicusDashboard.Layout.Models
 @using JetBrains.Lifetimes
@@ -17,7 +18,7 @@
 <div id="@myContainerId" class="@ContainerClass">
   @if (myIsLoading)
   {
-    <Loader LeftUpMargin="true" />
+    <Loader LeftUpMargin="true"/>
   }
 
   <div class="pipeline-part-name-outer-container" style="visibility: @(myIsLoading ? "collapse" : "visible")">
@@ -94,9 +95,6 @@
 </div>
 
 @code {
-  private static readonly Key<bool> ourExpandedKey = new(nameof(ourExpandedKey));
-
-
   private readonly Guid myContainerId = Guid.NewGuid();
 
 
@@ -151,12 +149,12 @@
 
   private static bool IsExpanded(PipelinePartExecutionResults results)
   {
-    return results.UserData.GetOrCreate(ourExpandedKey, static () => true);
+    return results.UserData.GetOrCreate(Keys.ExpandedKey, static () => true);
   }
 
   private void HandleExecutionResultTitleClicked(PipelinePartExecutionResults results)
   {
-    results.UserData.PutData(ourExpandedKey, !results.UserData.GetOrCreate(ourExpandedKey, static () => true));
+    results.UserData.PutData(Keys.ExpandedKey, !results.UserData.GetOrCreate(Keys.ExpandedKey, static () => true));
     StateHasChanged();
   }
 
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/SidebarList/Keys.cs b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/SidebarList/Keys.cs
new file mode 100644
index 000000000..f965475d5
--- /dev/null
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/SidebarList/Keys.cs
@@ -0,0 +1,8 @@
+using FicusDashboard.Utils;
+
+namespace FicusDashboard.Components.SidebarList;
+
+internal static class Keys
+{
+  public static readonly Key<bool> ExpandedKey = new(nameof(ExpandedKey));
+}
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/SidebarList/SidebarList.razor b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/SidebarList/SidebarList.razor
index 87ef76de8..e18c64df2 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/SidebarList/SidebarList.razor
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/SidebarList/SidebarList.razor
@@ -39,8 +39,6 @@
 
 @code
 {
-  private static readonly Key<bool> ourExpandedKey = new(nameof(ourExpandedKey));
-
 
   [Parameter] public string? ListItemIcon { get; set; }
   [Parameter] public required SidebarListContainer.Style ComponentStyle { get; set; }
@@ -54,7 +52,7 @@
 
   private bool IsExpanded(TItem item)
   {
-    return item.UserData.GetOrCreate(ourExpandedKey, static () => true);
+    return item.UserData.GetOrCreate(Keys.ExpandedKey, static () => true);
   }
 
   private void HandleInnerItemSelected(
@@ -69,8 +67,8 @@
 
   private void HandleItemTitleClicked(TItem item)
   {
-    var expanded = item.UserData.GetOrCreate(ourExpandedKey, static () => true);
-    item.UserData.PutData(ourExpandedKey, !expanded);
+    var expanded = item.UserData.GetOrCreate(Keys.ExpandedKey, static () => true);
+    item.UserData.PutData(Keys.ExpandedKey, !expanded);
 
     StateHasChanged();
   }
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Layout/MainLayout.razor b/Ficus/src/front/FicusFrontend/FicusDashboard/Layout/MainLayout.razor
index 83c3e6e89..f5bed7630 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Layout/MainLayout.razor
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Layout/MainLayout.razor
@@ -11,12 +11,12 @@
     <SubscriptionsList PipelineSelected="HandlePipelineSelected"/>
   </div>
   <div class="sidebar">
-    <CasesList CaseSelected="HandleNewCaseSelected" SelectedPipeline="mySelectedPipeline"/>
+    <CasesList CaseSelected="HandleNewCaseSelected" SelectedPipeline="mySelectedPipeline!"/>
   </div>
 
   <main>
     <article class="content px-4 case-info-container" style="height: 100%;">
-      <CaseInfo ProcessCaseData="mySelectedProcessCaseData"/>
+      <CaseInfo ProcessCaseData="mySelectedProcessCaseData!"/>
     </article>
   </main>
 </div>
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Utils/UserData.cs b/Ficus/src/front/FicusFrontend/FicusDashboard/Utils/UserData.cs
index f7492899b..0feca9409 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Utils/UserData.cs
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Utils/UserData.cs
@@ -1,17 +1,18 @@
 namespace FicusDashboard.Utils;
 
+// ReSharper disable once UnusedTypeParameter
 public class Key<T>(string name)
 {
   public string Name => name;
 }
 
-public abstract class UserDataHolderBase
+public sealed class UserDataHolder
 {
   private readonly Lock mySyncObject = new();
   private readonly Dictionary<object, object> myValues = new();
 
 
-  protected bool TryGetData<T>(Key<T> key, out T value)
+  public bool TryGetData<T>(Key<T> key, out T value)
   {
     value = default;
     lock (mySyncObject)
@@ -23,7 +24,7 @@ protected bool TryGetData<T>(Key<T> key, out T value)
     }
   }
 
-  protected void PutData<T>(Key<T> key, T value) where T : notnull
+  public void PutData<T>(Key<T> key, T value) where T : notnull
   {
     lock (mySyncObject)
     {
@@ -32,12 +33,6 @@ protected void PutData<T>(Key<T> key, T value) where T : notnull
   }
 }
 
-public sealed class UserDataHolder : UserDataHolderBase
-{
-  public bool TryGetData<T>(Key<T> key, out T value) => base.TryGetData(key, out value);
-  public void PutData<T>(Key<T> key, T value) where T : notnull => base.PutData(key, value);
-}
-
 public static class ExtensionsForUserData
 {
   extension(UserDataHolder holder)
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/PipelinePartsContextValuesService.cs b/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/PipelinePartsContextValuesService.cs
index 51db65a93..ea36d78d5 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/PipelinePartsContextValuesService.cs
+++ b/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/PipelinePartsContextValuesService.cs
@@ -5,8 +5,7 @@
 namespace FicusDashboardBackend.Features.PipelineUpdates.Services;
 
 public class PipelinePartsContextValuesService(
-  IPipelinePartsUpdatesRepository repository,
-  ILogger<PipelinePartsContextValuesService> logger
+  IPipelinePartsUpdatesRepository repository
 ) : GrpcPipelinePartsContextValuesService.GrpcPipelinePartsContextValuesServiceBase
 {
   public override Task<GrpcCaseContextValues> GetPipelineCaseContextValue(
diff --git a/Ficus/src/front/FicusFrontend/FicusKafkaIntegration/PipelinePartsUpdateKafkaSettings.cs b/Ficus/src/front/FicusFrontend/FicusKafkaIntegration/PipelinePartsUpdateKafkaSettings.cs
index b89ffcc0a..fdbb2b13b 100644
--- a/Ficus/src/front/FicusFrontend/FicusKafkaIntegration/PipelinePartsUpdateKafkaSettings.cs
+++ b/Ficus/src/front/FicusFrontend/FicusKafkaIntegration/PipelinePartsUpdateKafkaSettings.cs
@@ -2,6 +2,6 @@
 
 public class PipelinePartsUpdateKafkaSettings
 {
-  public string Topic { get; set; }
-  public string BootstrapServers { get; set; }
+  public required string Topic { get; init; }
+  public required string BootstrapServers { get; init; }
 }
\ No newline at end of file
diff --git a/Procfiler/src/dotnet/Core/CommandLine/ProcfilerException.cs b/Procfiler/src/dotnet/Core/CommandLine/ProcfilerException.cs
index 45ecf96c6..3aada2f93 100644
--- a/Procfiler/src/dotnet/Core/CommandLine/ProcfilerException.cs
+++ b/Procfiler/src/dotnet/Core/CommandLine/ProcfilerException.cs
@@ -1,5 +1,3 @@
-using System.Runtime.Serialization;
-
 namespace Core.CommandLine;
 
 public abstract class ProcfilerException : Exception
@@ -8,15 +6,7 @@ protected ProcfilerException()
   {
   }
 
-  protected ProcfilerException(SerializationInfo info, StreamingContext context) : base(info, context)
-  {
-  }
-
   protected ProcfilerException(string? message) : base(message)
   {
   }
-
-  protected ProcfilerException(string? message, Exception? innerException) : base(message, innerException)
-  {
-  }
 }
\ No newline at end of file
diff --git a/Procfiler/src/dotnet/Core/Core.csproj b/Procfiler/src/dotnet/Core/Core.csproj
index 9a663eccf..e9e05a567 100644
--- a/Procfiler/src/dotnet/Core/Core.csproj
+++ b/Procfiler/src/dotnet/Core/Core.csproj
@@ -25,10 +25,6 @@
     <ProjectReference Include="..\ProcfilerLoggerProvider\ProcfilerLoggerProvider.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\ProcfilerEventSources\ProcfilerEventSources.csproj"/>
-  </ItemGroup>
-
   <ItemGroup>
     <Folder Include="Events\"/>
   </ItemGroup>
diff --git a/Procfiler/src/dotnet/Core/Events/EventRecord/EventRecord.cs b/Procfiler/src/dotnet/Core/Events/EventRecord/EventRecord.cs
index 2ebae6340..c140e7e24 100644
--- a/Procfiler/src/dotnet/Core/Events/EventRecord/EventRecord.cs
+++ b/Procfiler/src/dotnet/Core/Events/EventRecord/EventRecord.cs
@@ -29,7 +29,7 @@ public class EventRecord : OcelObjectBase
   public string EventName { get; set; }
   public int StackTraceId { get; }
 
-  public override string? Type => EventClass;
+  public override string Type => EventClass;
 
 
   public EventRecord(EventRecordTime time, string eventClass, long managedThreadId, long nativeThreadId, Guid activityId,
diff --git a/Procfiler/src/dotnet/Core/Events/EventRecord/EventRecordExtensions.cs b/Procfiler/src/dotnet/Core/Events/EventRecord/EventRecordExtensions.cs
index 6c59b1bf4..5814b3c3e 100644
--- a/Procfiler/src/dotnet/Core/Events/EventRecord/EventRecordExtensions.cs
+++ b/Procfiler/src/dotnet/Core/Events/EventRecord/EventRecordExtensions.cs
@@ -174,7 +174,9 @@ public bool IsMethodStartEndProvider() =>
   public static EventRecordTime ToTime(this TraceEvent traceEvent) => new()
   {
     LoggedAt = traceEvent.TimeStamp.ToUniversalTime(),
+#pragma warning disable CS0618 // Type or member is obsolete
     QpcStamp = traceEvent.TimeStampQPC,
+#pragma warning restore CS0618 // Type or member is obsolete
     RelativeStampMSec = traceEvent.TimeStampRelativeMSec
   };
 
@@ -211,7 +213,7 @@ public bool IsOcelObjectEvent(out long objectId, out string? category)
       return true;
     }
 
-    public bool IsOcelGlobalEvent(out long objectId, out string activityName, out string? category)
+    public bool IsOcelGlobalEvent(out long objectId, out string? activityName, out string? category)
     {
       objectId = -1;
       activityName = null;
@@ -226,9 +228,6 @@ public bool IsOcelGlobalEvent(out long objectId, out string activityName, out st
       return true;
     }
 
-    public bool IsOcelActivitiesBatchBegin(out Guid batchId, out string[] names) =>
-      IsOcelActivitiesBatchEvent(evt, TraceEventsConstants.OcelBatchActivitiesBegin, out batchId, out names);
-
     private bool IsOcelActivitiesBatchEvent(string eventClass, out Guid batchId, out string[] names)
     {
       batchId = Guid.Empty;
@@ -244,20 +243,5 @@ private bool IsOcelActivitiesBatchEvent(string eventClass, out Guid batchId, out
 
     public bool IsOcelActivitiesBatchEnd(out Guid batchId, out string[] names) =>
       IsOcelActivitiesBatchEvent(evt, TraceEventsConstants.OcelBatchActivitiesEnd, out batchId, out names);
-
-    public bool IsOcelBatchAttachedEvent(out long objectId, out string activity, out string? category)
-    {
-      objectId = 0;
-      activity = null;
-      category = null;
-
-      if (evt.EventClass is not TraceEventsConstants.OcelBatchObjectEvent) return false;
-
-      objectId = int.Parse(evt.Metadata[TraceEventsConstants.OcelObjectId]);
-      category = evt.Metadata[TraceEventsConstants.OcelObjectType];
-      activity = evt.Metadata[TraceEventsConstants.OcelActivityName];
-
-      return true;
-    }
   }
 }
\ No newline at end of file
diff --git a/Procfiler/src/dotnet/Core/EventsProcessing/Mutators/Core/MetadataKeysWithTransform.cs b/Procfiler/src/dotnet/Core/EventsProcessing/Mutators/Core/MetadataKeysWithTransform.cs
index ccf6726ba..66e9c8d64 100644
--- a/Procfiler/src/dotnet/Core/EventsProcessing/Mutators/Core/MetadataKeysWithTransform.cs
+++ b/Procfiler/src/dotnet/Core/EventsProcessing/Mutators/Core/MetadataKeysWithTransform.cs
@@ -26,9 +26,6 @@ public static MetadataKeysWithTransform CreateForModuleILFileName(string metadat
   public static MetadataKeysWithTransform CreateForModuleILPath(string metadataKey, EventClassKind eventClass) =>
     new(metadataKey, MutatorsUtil.TransformDomainModuleFilePathForEventNameConcatenation, eventClass);
 
-  public static MetadataKeysWithTransform CreateForMethodLikeName(string metadataKey, EventClassKind eventClass) =>
-    new(metadataKey, MutatorsUtil.TransformMethodLikeNameForEventNameConcatenation, eventClass);
-
   public static MetadataKeysWithTransform CreateIdenticalTransform(string metadataKey, EventClassKind eventClass) =>
     new(metadataKey, value => value, eventClass);
 }
\ No newline at end of file
diff --git a/Procfiler/src/dotnet/Core/EventsProcessing/Mutators/SingleEventMutators/InplaceMutators/BusinessEventMutator.cs b/Procfiler/src/dotnet/Core/EventsProcessing/Mutators/SingleEventMutators/InplaceMutators/BusinessEventMutator.cs
index a24904597..53ee19e16 100644
--- a/Procfiler/src/dotnet/Core/EventsProcessing/Mutators/SingleEventMutators/InplaceMutators/BusinessEventMutator.cs
+++ b/Procfiler/src/dotnet/Core/EventsProcessing/Mutators/SingleEventMutators/InplaceMutators/BusinessEventMutator.cs
@@ -32,7 +32,7 @@ protected override void ProcessInternal(EventRecordWithMetadata eventRecord, IGl
       }
       else
       {
-        logger.LogWarning("Attributes key values count is not % 2 == 0");
+        Logger.LogWarning("Attributes key values count is not % 2 == 0");
       }
     }
 
diff --git a/Procfiler/src/dotnet/Core/InstrumentalProfiler/IDllMethodsPatcher.cs b/Procfiler/src/dotnet/Core/InstrumentalProfiler/IDllMethodsPatcher.cs
index 4d8d05210..ad53fc52a 100644
--- a/Procfiler/src/dotnet/Core/InstrumentalProfiler/IDllMethodsPatcher.cs
+++ b/Procfiler/src/dotnet/Core/InstrumentalProfiler/IDllMethodsPatcher.cs
@@ -180,11 +180,11 @@ private void PatchMethod(
     {
       if (ShouldInsertExitLogging(instructions, i))
       {
-        InsertProcfilerLogBefore(i, processor, methodFinishedLogReference, false);
+        InsertProcfilerLogBefore(i, processor, methodFinishedLogReference);
       }
     }
 
-    InsertProcfilerLogBefore(0, processor, methodStartedLogReference, true);
+    InsertProcfilerLogBefore(0, processor, methodStartedLogReference);
 
     Instruction GetStartOfInsertedInstructions(Instruction context) => context.Previous.Previous.Previous.Previous;
 
@@ -222,10 +222,6 @@ private static bool IsMethodWithOneStringParameter(MethodDefinition methodDefini
     methodDefinition.Parameters.Count == 1 &&
     methodDefinition.Parameters[0].ParameterType.FullName == DotNetConstants.SystemString;
 
-  private static bool IsConsoleWriteLineMethod(MethodDefinition methodDefinition) =>
-    methodDefinition.Name == DotNetConstants.WriteLine &&
-    IsMethodWithOneStringParameter(methodDefinition);
-
   private static bool ShouldInsertExitLogging(Instruction instruction) =>
     instruction.OpCode == OpCodes.Ret;
 
@@ -233,7 +229,7 @@ private static bool ShouldInsertExitLogging(Collection<Instruction> instructions
     ShouldInsertExitLogging(instructions[index]);
 
   private static void InsertProcfilerLogBefore(
-    int index, ILProcessor processor, MethodReference methodReference, bool entering)
+    int index, ILProcessor processor, MethodReference methodReference)
   {
     var message = processor.Body.Method.FullName;
 
diff --git a/Procfiler/src/dotnet/Core/Ocel/MethodOcelLogWriter.cs b/Procfiler/src/dotnet/Core/Ocel/MethodOcelLogWriter.cs
index 5ee594593..7db3108da 100644
--- a/Procfiler/src/dotnet/Core/Ocel/MethodOcelLogWriter.cs
+++ b/Procfiler/src/dotnet/Core/Ocel/MethodOcelLogWriter.cs
@@ -32,6 +32,12 @@ public void Process(EventRecordWithMetadata evt)
   {
     if (evt.IsOcelGlobalEvent(out var objectId, out var activityName, out var category))
     {
+      if (activityName is null)
+      {
+        logger.LogWarning("Activity name was null for {ObjectId}", objectId);
+        return;
+      }
+
       var state = myGlobalActivities.GetOrCreate(activityName, () => new ActivityInfo(evt.Time.LoggedAt.ToUniversalTime()));
       state.Events.GetOrCreate(category ?? string.Empty, static () => []).Add(objectId);
       state.EndDate = evt.Time.LoggedAt.ToUniversalTime();
diff --git a/Procfiler/src/dotnet/Procfiler/src/Commands/CollectClrEvents/Split/SplitEventsByMethodCommand.cs b/Procfiler/src/dotnet/Procfiler/src/Commands/CollectClrEvents/Split/SplitEventsByMethodCommand.cs
index 87e9833e0..ccae7ebe4 100644
--- a/Procfiler/src/dotnet/Procfiler/src/Commands/CollectClrEvents/Split/SplitEventsByMethodCommand.cs
+++ b/Procfiler/src/dotnet/Procfiler/src/Commands/CollectClrEvents/Split/SplitEventsByMethodCommand.cs
@@ -1,3 +1,5 @@
+// ReSharper disable AccessToDisposedClosure
+
 using Core.CommandLine;
 using Core.Container;
 using Core.Events.EventRecord;
@@ -95,7 +97,6 @@ public override void Execute(CollectClrEventsContext context)
         serializers.Add(ocelSerializer);
       }
 
-      // ReSharper disable once AccessToDisposedClosure
       if (splitter.SplitNonAlloc(serializers, splitContext) is not { } methods) return;
 
       foreach (var (methodName, traces) in methods)
@@ -105,7 +106,6 @@ public override void Execute(CollectClrEventsContext context)
 
         foreach (var (_, sessionInfo) in eventsByMethodsInvocation)
         {
-          // ReSharper disable once AccessToDisposedClosure
           notStoringSerializer.WriteTrace(filePath, sessionInfo);
         }
       }
@@ -147,8 +147,8 @@ private INotStoringMergingTraceSerializer CreateNotStoringSerializer(CollectClrE
 
     return context.CommonContext.LogSerializationFormat switch
     {
-      LogFormat.Xes => new NotStoringMergingTraceXesSerializer(xesEventsSessionSerializer, logger, writeAllMetadata),
-      LogFormat.Bxes => new NotStoringMergingTraceBxesSerializer(logger, writeAllMetadata),
+      LogFormat.Xes => new NotStoringMergingTraceXesSerializer(xesEventsSessionSerializer, Logger, writeAllMetadata),
+      LogFormat.Bxes => new NotStoringMergingTraceBxesSerializer(Logger, writeAllMetadata),
       _ => throw new ArgumentOutOfRangeException()
     };
   }
@@ -167,9 +167,9 @@ private IOnlineMethodsSerializer CreateOnlineSerializer(CollectClrEventsContext
     return context.CommonContext.LogSerializationFormat switch
     {
       LogFormat.Bxes => new OnlineBxesMethodsSerializer(
-        directory, targetMethodsRegex, methodNameBeautifier, eventsFactory, logger, writeAllEventData),
+        directory, targetMethodsRegex, methodNameBeautifier, eventsFactory, Logger, writeAllEventData),
       LogFormat.Xes => new OnlineMethodsXesSerializer(
-        directory, targetMethodsRegex, xesEventsSessionSerializer, methodNameBeautifier, eventsFactory, logger, writeAllEventData),
+        directory, targetMethodsRegex, xesEventsSessionSerializer, methodNameBeautifier, eventsFactory, Logger, writeAllEventData),
       _ => throw new ArgumentOutOfRangeException()
     };
   }
diff --git a/Procfiler/src/dotnet/Procfiler/src/Commands/CollectClrEvents/Split/SplitEventsHelper.cs b/Procfiler/src/dotnet/Procfiler/src/Commands/CollectClrEvents/Split/SplitEventsHelper.cs
index 957869027..78d032c5f 100644
--- a/Procfiler/src/dotnet/Procfiler/src/Commands/CollectClrEvents/Split/SplitEventsHelper.cs
+++ b/Procfiler/src/dotnet/Procfiler/src/Commands/CollectClrEvents/Split/SplitEventsHelper.cs
@@ -26,8 +26,7 @@ public static Dictionary<TKey, IEventsCollection> SplitByKey<TKey>(
     }
 
     return map.ToDictionary(
-      pair => pair.Key,
-      pair => (IEventsCollection)new EventsCollectionImpl(pair.Value.ToArray(), logger)
+      pair => pair.Key, IEventsCollection (pair) => new EventsCollectionImpl(pair.Value.ToArray(), logger)
     );
   }
 }
\ No newline at end of file

From 25805adfe77f68d604df206b559f9dc6d53743de Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneq@yandex.ru>
Date: Sun, 15 Mar 2026 20:35:36 +0300
Subject: [PATCH 02/53] Add updates count in kafka integration tests

---
 .../FicusKafkaIntegrationTests.cs               | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/Ficus/test/IntegrationTests/IntegrationTests/FicusKafkaIntegrationTests.cs b/Ficus/test/IntegrationTests/IntegrationTests/FicusKafkaIntegrationTests.cs
index d080e3611..0d59446a1 100644
--- a/Ficus/test/IntegrationTests/IntegrationTests/FicusKafkaIntegrationTests.cs
+++ b/Ficus/test/IntegrationTests/IntegrationTests/FicusKafkaIntegrationTests.cs
@@ -22,7 +22,7 @@ public void EventNamesTest()
   {
     var eventLog = GenerateTestEventLog();
     ProduceEventLogToKafka(eventLog);
-    AssertNamesLogMatchesOriginal(eventLog, ConsumeAllUpdates());
+    AssertNamesLogMatchesOriginal(eventLog, ConsumeAllUpdates(eventLog.Traces.Count));
   }
 
   [Test]
@@ -38,7 +38,7 @@ public void SameTraceIdTest()
     }
 
     ProduceEventLogToKafka(eventLog);
-    AssertNamesLogMatchesMergedOriginal(eventLog, ConsumeAllUpdates());
+    AssertNamesLogMatchesMergedOriginal(eventLog, ConsumeAllUpdates(eventLog.Traces.Count));
   }
 
   private static void AssertNamesLogMatchesMergedOriginal(IEventLog eventLog, IReadOnlyList<GrpcKafkaUpdate> updates)
@@ -117,19 +117,21 @@ private void ProduceEventLogToKafka(IEventLog eventLog)
     Thread.Sleep(10_000);
   }
 
-  private IReadOnlyList<GrpcKafkaUpdate> ConsumeAllUpdates()
+  private IReadOnlyList<GrpcKafkaUpdate> ConsumeAllUpdates(int updatesCount)
   {
     var logger = LoggerFactory.Create(_ => { }).CreateLogger<PipelinePartsUpdatesConsumer>();
-    return ConsumeAllUpdates(logger);
+    return ConsumeAllUpdates(logger, updatesCount);
   }
 
-  private IReadOnlyList<GrpcKafkaUpdate> ConsumeAllUpdates(ILogger logger)
+  private IReadOnlyList<GrpcKafkaUpdate> ConsumeAllUpdates(ILogger logger, int updatesCount)
   {
     const string ConsumerGroupId = $"{nameof(FicusKafkaIntegrationTests)}::{nameof(ConsumeAllUpdates)}";
     var consumer =
       PipelinePartsResultsConsumptionUtil.CreateConsumerAndWaitUntilTopicExists(PipelinePartsSettings, ConsumerGroupId, logger);
 
     List<GrpcKafkaUpdate> result = [];
+    var consumed = 0;
+
     while (true)
     {
       var consumeResult = consumer.Consume();
@@ -137,6 +139,11 @@ private IReadOnlyList<GrpcKafkaUpdate> ConsumeAllUpdates(ILogger logger)
 
       result.Add(consumeResult.Message.Value);
       consumer.Commit();
+
+      if (++consumed == updatesCount)
+      {
+        break;
+      }
     }
 
     return result;

From 976e027812c90d8f9d7bb976926c34093d84dce0 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneq@yandex.ru>
Date: Sat, 28 Mar 2026 15:18:07 +0300
Subject: [PATCH 03/53] Don't show aggregated data section if there is no
 aggregated data

---
 .../Canvas/Graph/GraphRenderer.razor          | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/Graph/GraphRenderer.razor b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/Graph/GraphRenderer.razor
index 54b2f76ae..1dfdff4b0 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/Graph/GraphRenderer.razor
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseInfo/ContextValues/Canvas/Graph/GraphRenderer.razor
@@ -8,7 +8,15 @@
 
 
 <div style="display: flex; flex-direction: column; width: 100%; height: 100%; padding: 5px;">
-  <div style="display: flex; flex-direction: row; width: 100%; max-height: 85%;">
+  @{
+    const int ContentHeightPercent = 85;
+
+    var hasAggregatedData = myAggregatedData is { IsEmpty: false };
+    var contentHeight = hasAggregatedData ? $"{ContentHeightPercent}%" : "100%";
+    var aggregatedDataHeight = $"{100 - ContentHeightPercent}%";
+  }
+
+  <div style="display: flex; flex-direction: row; width: 100%; max-height: @contentHeight;">
     <GraphLikeEntitySettings @ref="@mySettings"
                              Enhancements="@myEnhancements"
                              CanRenderFlamegraph="@(myContext is { })">
@@ -32,12 +40,12 @@
     </div>
   </div>
 
-  <div style="margin-top: 5px; height: 15%;">
-    @if (myAggregatedData is { IsEmpty: false } data)
-    {
-      <AggregatedDataRenderer Data="@data"/>
-    }
-  </div>
+  @if (hasAggregatedData)
+  {
+    <div style="margin-top: 5px; height: @aggregatedDataHeight;">
+      <AggregatedDataRenderer Data="@(myAggregatedData!)"/>
+    </div>
+  }
 </div>
 
 @code

From d550fba610379fb9181dc1673a55571f202a5c18 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneq@yandex.ru>
Date: Sat, 18 Apr 2026 20:03:06 +0300
Subject: [PATCH 04/53] Adjust run scripts, add clean before build, use net10.0

---
 .run/unix/ProcfilerOnline.sh     |  3 ++-
 .run/windows/Procfiler.cmd       |  3 ++-
 .run/windows/ProcfilerOnline.cmd | 11 ++++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.run/unix/ProcfilerOnline.sh b/.run/unix/ProcfilerOnline.sh
index 58a62d450..c77fa3e74 100755
--- a/.run/unix/ProcfilerOnline.sh
+++ b/.run/unix/ProcfilerOnline.sh
@@ -4,11 +4,12 @@ export ProduceGcEvents=false
 export OnlineProcfilerSettings__KafkaSettings__TopicName=my-topic
 export OnlineProcfilerSettings__KafkaSettings__BootstrapServers=localhost:9092
 
+dotnet clean "$PM_IDE_ROOT"/All.sln
 dotnet build "$PM_IDE_ROOT"/Procfiler/src/dotnet/ProcfilerLoggerProvider/ -c Release
 dotnet build "$PM_IDE_ROOT"/Procfiler/test_data/source/WFWebApp/WFWebApp.csproj -c Release
 dotnet build "$PM_IDE_ROOT"/All.sln -c Release
 
-"$PM_IDE_ROOT"/Procfiler/src/dotnet/ProcfilerOnline/bin/Release/net9.0/ProcfilerOnline procfiler-online collect-online \
+"$PM_IDE_ROOT"/Procfiler/src/dotnet/ProcfilerOnline/bin/Release/net10.0/ProcfilerOnline procfiler-online collect-online \
  -dll-path "$PM_IDE_ROOT"/Procfiler/test_data/source/WFWebApp/bin/Release/net9.0/WFWebApp.dll \
  --target-methods-regex \
  WFWebApp \
diff --git a/.run/windows/Procfiler.cmd b/.run/windows/Procfiler.cmd
index 463cb4663..6d2c01a79 100644
--- a/.run/windows/Procfiler.cmd
+++ b/.run/windows/Procfiler.cmd
@@ -1,6 +1,7 @@
+dotnet clean %PM_IDE_ROOT%/All.sln
 dotnet build %PM_IDE_ROOT%/All.sln
 
-%PM_IDE_ROOT%/Procfiler/src/dotnet/Procfiler/bin/Release/net9.0/Procfiler.exe procfiler^
+%PM_IDE_ROOT%/Procfiler/src/dotnet/Procfiler/bin/Release/net10.0/Procfiler.exe procfiler^
  collect-to-xes^
  -csproj^
  %PM_IDE_ROOT%\Procfiler\test_data\source\LOHAllocations\LOHAllocations.csproj^
diff --git a/.run/windows/ProcfilerOnline.cmd b/.run/windows/ProcfilerOnline.cmd
index 0c3acf6b1..78dfefafc 100644
--- a/.run/windows/ProcfilerOnline.cmd
+++ b/.run/windows/ProcfilerOnline.cmd
@@ -1,16 +1,17 @@
 set ProduceEventsToKafka=true
 set ProduceBxesKafkaEvents=true
-set ProduceGcEvents=false
+set ProduceGcEvents=true
 set OnlineProcfilerSettings__KafkaSettings__TopicName=my-topic
 set OnlineProcfilerSettings__KafkaSettings__BootstrapServers=localhost:9092
 
+dotnet clean %PM_IDE_ROOT%/All.sln
 dotnet build %PM_IDE_ROOT%/All.sln -c Release
 dotnet build %PM_IDE_ROOT%/Procfiler/src/dotnet/ProcfilerLoggerProvider/ -c Release
 dotnet build %PM_IDE_ROOT%/Procfiler/test_data/source/WFWebApp -c Release
 
-%PM_IDE_ROOT%/Procfiler/src/dotnet/ProcfilerOnline/bin/Release/net9.0/ProcfilerOnline.exe procfiler-online collect-online^
- -dll-path %PM_IDE_ROOT%\Procfiler\test_data\source\WFWebApp\bin\Release\net9.0\WFWebApp.dll^
+%PM_IDE_ROOT%/Procfiler/src/dotnet/ProcfilerOnline/bin/Release/net10.0/ProcfilerOnline.exe procfiler-online collect-online^
+ -dll-path D:\work\DPN-Soundness-Verification\DPN.VerificationApp\bin\Debug\net10.0-windows\DPNVerifier.Desktop.dll^
  --target-methods-regex^
- WFWebApp^
+ DPN\.Soundness^
  --methods-filter-regex^
- WFWebApp^
\ No newline at end of file
+ DPN\.Soundness^
\ No newline at end of file

From df39f530a6ad236dc2f9f42f7503f493ace13f0c Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneq@yandex.ru>
Date: Sun, 19 Apr 2026 12:32:57 +0300
Subject: [PATCH 05/53] Fix key not found exception when there is no caseItem
 for some reason

---
 .../Components/CaseList/CasesList.razor              | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseList/CasesList.razor b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseList/CasesList.razor
index d78db6205..569882828 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseList/CasesList.razor
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Components/CaseList/CasesList.razor
@@ -252,8 +252,7 @@
   private void RemoveCase(Case caseModel)
   {
     if (myRootItem is null) return;
-
-    var currentItem = FindCaseItem(caseModel);
+    if (FindCaseItem(caseModel) is not { } currentItem) return;
 
     var namePartIndex = caseModel.NameParts.Count - 1;
     currentItem.Parent?.InnerItems.Remove(caseModel.NameParts[namePartIndex]);
@@ -274,16 +273,15 @@
     }
   }
 
-  private TreeViewItem FindCaseItem(Case caseModel)
+  private TreeViewItem? FindCaseItem(Case caseModel)
   {
     Debug.Assert(myRootItem is { });
 
-    var processItem = myRootItem.InnerItems[caseModel.ParentProcess.ProcessName];
+    if (!myRootItem.InnerItems.TryGetValue(caseModel.ParentProcess.ProcessName, out var currentItem)) return null;
 
-    var currentItem = processItem;
     foreach (var namePart in caseModel.NameParts)
     {
-      currentItem = currentItem.InnerItems[namePart];
+      if (!currentItem.InnerItems.TryGetValue(namePart, out currentItem)) return null;
     }
 
     return currentItem;
@@ -293,8 +291,8 @@
   {
     if (myRootItem is null) return;
     if (ReferenceEquals(caseModel, mySelectedCase)) return;
+    if (FindCaseItem(caseModel) is not { } item) return;
 
-    var item = FindCaseItem(caseModel);
     item.UserData.PutData(ComponentsKeys.ProcessingStateKey, ItemProcessingState.Updated);
 
     StateHasChanged();

From 3e541d5369cab9ee09473ffa192d292da31ab39e Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneq@yandex.ru>
Date: Sun, 19 Apr 2026 17:15:12 +0300
Subject: [PATCH 06/53] Add activities extraction + ECFG pipeline

---
 .../activities_ecfg_pipeline.py               | 39 +++++++++++++++++++
 .../kafka_pipelines/software_data_config.json |  2 +-
 docker-compose.monitoring.yml                 |  2 +-
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py

diff --git a/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py b/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py
new file mode 100644
index 000000000..a700fb871
--- /dev/null
+++ b/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py
@@ -0,0 +1,39 @@
+from common import execute_pipeline
+from ficus import *
+
+execute_pipeline(
+    'MySubscription',
+    'Pipeline',
+    [
+        RemainOnlyMethodStartEvents(),
+        SetMethodsDisplayName(),
+        ShortenAllocationType(),
+        PrepareSoftwareLog(time_attribute = 'QpcStamp'),
+        TerminateIfEmptyLog(),
+        TracesDiversityDiagramCanvas(),
+        AddStartEndArtificialEvents(),
+        DiscoverLoopsStrict(),
+        CreateLogFromActivitiesInstances(strategy=UndefinedActivityHandlingStrategy.InsertAllEvents),
+        ClearActivitiesRelatedStuff(),
+        DiscoverActivitiesForSeveralLevels(['.*'],
+                                           PatternsKind.MaximalRepeats,
+                                           activity_filter_kind=ActivityFilterKind.NoFilter),
+        DrawFullActivitiesDiagramCanvas(plot_legend=False, height_scale=10, width_scale=0.01),
+        ClusterizeActivitiesFromTracesDbscan(min_events_count_in_cluster=2,
+                                             tolerance=0.1,
+                                             activities_repr_source=ActivitiesRepresentationSource.EventClasses,
+                                             distance=Distance.Cosine,
+                                             activity_level=0,
+                                             view_params=(30, 60),
+                                             legend_cols=4,
+                                             visualization_method=DatasetVisualizationMethod.TSNE,
+                                             n_components=NComponents.Three),
+        DrawFullActivitiesDiagramCanvas(plot_legend=False, height_scale=10, width_scale=0.01),
+        CreateLogFromActivitiesInstances(strategy=UndefinedActivityHandlingStrategy.InsertAllEvents),
+        ClearActivitiesRelatedStuff(),
+        TracesDiversityDiagramCanvas(),
+        DiscoverECFG(root_sequence_kind=RootSequenceKind.FindBest,
+                     merge_sequences_of_events=False),
+        AnnotateGraphWithTime(TimeAnnotationKind.Mean),
+    ]
+)
diff --git a/Ficus/examples/kafka_pipelines/software_data_config.json b/Ficus/examples/kafka_pipelines/software_data_config.json
index 1e3a2cf8f..b56fbdf31 100644
--- a/Ficus/examples/kafka_pipelines/software_data_config.json
+++ b/Ficus/examples/kafka_pipelines/software_data_config.json
@@ -343,6 +343,6 @@
     }
   ],
   "raw_control_flow_regexes": [
-    "BusinessEvent"
+    "ProcfilerMethod"
   ]
 }
\ No newline at end of file
diff --git a/docker-compose.monitoring.yml b/docker-compose.monitoring.yml
index 99df024fb..3fc7e990e 100644
--- a/docker-compose.monitoring.yml
+++ b/docker-compose.monitoring.yml
@@ -76,7 +76,7 @@ services:
       context: .
       dockerfile: ./Ficus/examples/kafka_pipelines/Dockerfile
       args:
-        SCRIPT_FILE_NAME: kafka_pipeline.py
+        SCRIPT_FILE_NAME: activities_ecfg_pipeline.py
     environment:
       CONSUMER_BOOTSTRAP_SERVERS: kafka:29092
       CONSUMER_TOPIC: my-topic

From ca5d9d544bcbd308c2336eda9acc637a3249f132 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneq@yandex.ru>
Date: Sun, 19 Apr 2026 17:42:45 +0300
Subject: [PATCH 07/53] Fix blue edges colors

---
 .../Npm/src/graph/graph_elements.ts             | 17 +----------------
 .../FicusDashboard/Npm/src/graph/labels/util.ts |  6 +++++-
 .../FicusDashboard/Npm/src/graph/util.ts        |  7 ++++++-
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/graph/graph_elements.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/graph/graph_elements.ts
index 69f98f2e7..af203bb08 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/graph/graph_elements.ts
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/graph/graph_elements.ts
@@ -24,8 +24,6 @@ import {createTimeSpanString} from "./labels/util";
 import {GrpcDurationKind} from "../protos/ficus/GrpcDurationKind";
 import {createNodeStandaloneEnhancements} from "./labels/node_html_label";
 
-const graphColor = graphColors(darkTheme);
-
 export function createGraphElements(
   graph: GrpcGraph,
   annotation: GrpcAnnotation,
@@ -195,7 +193,6 @@ export function createEnhancedEdges(
   let elements = createGraphEdgesElements(graph.edges, performanceEdgesMap, aggregatedData, filter);
 
   return elements.map(e => {
-
     let enhancementHtml = "";
     if (e.data.enhancementData != null) {
       enhancementHtml = createEdgeStandaloneEnhancements(enhancements, e.data.enhancementData, aggregatedData);
@@ -255,20 +252,8 @@ function createGraphEdgesElements(
       width = 1;
     }
 
-    let blueMin = graphColor.blueMin;
-    let blueMax = graphColor.blueMax;
-
-    let greenMin = graphColor.greenMin;
-    let greenMax = graphColor.greenMax;
-
-    let redMin = graphColor.redMin;
-    let redMax = graphColor.redMax;
-
     let executionTime = performanceMap[edge.id] ?? calculateEdgeExecutionTime(edge);
-
-    let color = executionTime == null ?
-      calculateGradient(redMin, redMax, greenMin, greenMax, blueMin, blueMax, weightRatio) :
-      getPerformanceAnnotationColor(executionTime / aggregatedData.totalExecutionTimeNs);
+    let color = getPerformanceAnnotationColor(executionTime / aggregatedData.totalExecutionTimeNs);
 
     elements.push({
       data: {
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/graph/labels/util.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/graph/labels/util.ts
index 69e5f152f..11082ac1e 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/graph/labels/util.ts
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/graph/labels/util.ts
@@ -230,6 +230,10 @@ function processTimeSpanString(str: string): string {
 }
 
 function createTimeSpanStringInternal(value: number, kind: GrpcDurationKind) {
+  if (!Number.isFinite(value)) {
+    return "0:0:0";
+  }
+
   switch (kind) {
     case GrpcDurationKind.Nanos:
       return TimeSpan.fromNanoseconds(BigInt(value)).toString();
@@ -246,6 +250,6 @@ function createTimeSpanStringInternal(value: number, kind: GrpcDurationKind) {
     case GrpcDurationKind.Days:
       return TimeSpan.fromDays(value).toString();
     default:
-      console.error("Not supported timespan ")
+      console.error("Not supported timespan")
   }
 }
\ No newline at end of file
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/graph/util.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/graph/util.ts
index 8cbdb3772..e46b23990 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/graph/util.ts
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/graph/util.ts
@@ -253,7 +253,12 @@ export function belongsToRootSequence(node: GraphNode) {
 const performanceColor = performanceColors(darkTheme);
 
 export function getPerformanceAnnotationColor(relativeExecutionTime: number) {
-  let colorName = `color${(Math.floor(relativeExecutionTime * 10) % 100).toString()}`;
+  const COLOR_PREFIX = "color"
+  if (!Number.isFinite(relativeExecutionTime)) {
+    return performanceColor[`${COLOR_PREFIX}0`];
+  }
+
+  let colorName = `${COLOR_PREFIX}${(Math.floor(relativeExecutionTime * 10) % 100).toString()}`;
   return performanceColor[colorName];
 }
 

From 7bb5b50cf4b5c28d41d3d8bedb126e4568f199b6 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Fri, 1 May 2026 21:21:18 +0300
Subject: [PATCH 08/53] Splitting tests by tfm

---
 .../Core/OnlineProcfilerTestWithGold.cs       | 11 ++++-----
 .../Core/GoldProcessBasedTest.cs              | 23 +++++++++++++------
 Procfiler/src/dotnet/TestsUtil/GoldUtil.cs    | 16 ++++---------
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/Procfiler/src/dotnet/OnlineProcfilerTests/Core/OnlineProcfilerTestWithGold.cs b/Procfiler/src/dotnet/OnlineProcfilerTests/Core/OnlineProcfilerTestWithGold.cs
index 4fe144a4e..67459fb63 100644
--- a/Procfiler/src/dotnet/OnlineProcfilerTests/Core/OnlineProcfilerTestWithGold.cs
+++ b/Procfiler/src/dotnet/OnlineProcfilerTests/Core/OnlineProcfilerTestWithGold.cs
@@ -8,14 +8,13 @@ public abstract class OnlineProcfilerTestWithGold : OnlineProcfilerTestBase
   protected void Execute(Func<string> goldCreator)
   {
     var testValue = goldCreator().RemoveRn();
-    GoldUtil.ExecuteGoldTest(testValue, GetType().Name, test =>
+    GoldUtil.ExecuteGoldTest(testValue, GetType().Name, () =>
     {
-      if (test.Arguments.FirstOrDefault() is KnownSolution solution)
+      return TestContext.CurrentContext.Test.Arguments.FirstOrDefault() switch
       {
-        return solution.Name;
-      }
-
-      return test.Name;
+        KnownSolution solution => solution.Name,
+        _ => TestContext.CurrentContext.Test.Name
+      };
     });
   }
 }
\ No newline at end of file
diff --git a/Procfiler/src/dotnet/ProcfilerTests/Core/GoldProcessBasedTest.cs b/Procfiler/src/dotnet/ProcfilerTests/Core/GoldProcessBasedTest.cs
index bf7d880fc..bf3fd340a 100644
--- a/Procfiler/src/dotnet/ProcfilerTests/Core/GoldProcessBasedTest.cs
+++ b/Procfiler/src/dotnet/ProcfilerTests/Core/GoldProcessBasedTest.cs
@@ -12,19 +12,28 @@ protected void ExecuteTestWithGold(CollectClrEventsFromExeContext context, Func<
     StartProcessAndDoTestWithDefaultContext(context, events =>
     {
       var folderName = GetType().Name;
+      if (TryGetFramework() is { } tfm)
+      {
+        folderName = Path.Combine(folderName, tfm);
+      }
+
       var testValue = testFunc(events).RemoveRn();
 
       GoldUtil.ExecuteGoldTest(testValue, folderName, ExtractTestName);
     });
   }
 
-  private static string ExtractTestName(TestContext.TestAdapter test)
+  private static object? TryGetFirstArg() => TestContext.CurrentContext.Test.Arguments.FirstOrDefault();
+
+  private static string? TryGetFramework() => TryGetFirstArg() switch
   {
-    if (test.Arguments.FirstOrDefault() is ContextWithSolution dto)
-    {
-      return dto.Solution.Name;
-    }
+    ContextWithSolution dto => dto.Solution.Tfm,
+    _ => null
+  };
 
-    return test.Name;
-  }
+  private static string ExtractTestName() => TryGetFirstArg() switch
+  {
+    ContextWithSolution dto => dto.Solution.Name,
+    _ => TestContext.CurrentContext.Test.Name
+  };
 }
\ No newline at end of file
diff --git a/Procfiler/src/dotnet/TestsUtil/GoldUtil.cs b/Procfiler/src/dotnet/TestsUtil/GoldUtil.cs
index 76cc50a07..e52a09bc5 100644
--- a/Procfiler/src/dotnet/TestsUtil/GoldUtil.cs
+++ b/Procfiler/src/dotnet/TestsUtil/GoldUtil.cs
@@ -6,7 +6,7 @@ namespace TestsUtil;
 
 public static class GoldUtil
 {
-  public static void ExecuteGoldTest(string testValue, string folderName, Func<TestContext.TestAdapter, string> testNameExtractor)
+  public static void ExecuteGoldTest(string testValue, string folderName, Func<string> testNameExtractor)
   {
     var pathToGoldFile = CreateGoldFilePath(folderName, testNameExtractor);
 
@@ -36,14 +36,8 @@ public static void ExecuteGoldTest(string testValue, string folderName, Func<Tes
     }
   }
 
-  public static string CreateGoldFilePath(string folderName, Func<TestContext.TestAdapter, string> testNameExtractor) =>
-    CreatePathInternal(folderName, $"{CreateTestNameForFiles(testNameExtractor)}.gold");
-
-  private static string CreateTestNameForFiles(Func<TestContext.TestAdapter, string> testNameExtractor)
-  {
-    var test = TestContext.CurrentContext.Test;
-    return testNameExtractor(test);
-  }
+  private static string CreateGoldFilePath(string folderName, Func<string> testNameExtractor) =>
+    CreatePathInternal(folderName, $"{testNameExtractor()}.gold");
 
   private static string CreatePathInternal(string folderName, string fileName)
   {
@@ -66,6 +60,6 @@ private static string GetOsFolderOrThrow()
     throw new ArgumentOutOfRangeException(Environment.OSVersion.Platform.ToString());
   }
 
-  public static string CreateTmpFilePath(string folderName, Func<TestContext.TestAdapter, string> testNameExtractor) =>
-    CreatePathInternal(folderName, $"{CreateTestNameForFiles(testNameExtractor)}.tmp");
+  private static string CreateTmpFilePath(string folderName, Func<string> testNameExtractor) =>
+    CreatePathInternal(folderName, $"{testNameExtractor()}.tmp");
 }
\ No newline at end of file

From 2912575b299195263515eab8a594dd0dd021c8d2 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Fri, 1 May 2026 21:42:28 +0300
Subject: [PATCH 09/53] Use by-tfm folders in OnlineProcfiler tests

---
 .../Core/OnlineProcfilerTestWithGold.cs            | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/Procfiler/src/dotnet/OnlineProcfilerTests/Core/OnlineProcfilerTestWithGold.cs b/Procfiler/src/dotnet/OnlineProcfilerTests/Core/OnlineProcfilerTestWithGold.cs
index 67459fb63..12a6b8fc4 100644
--- a/Procfiler/src/dotnet/OnlineProcfilerTests/Core/OnlineProcfilerTestWithGold.cs
+++ b/Procfiler/src/dotnet/OnlineProcfilerTests/Core/OnlineProcfilerTestWithGold.cs
@@ -8,11 +8,19 @@ public abstract class OnlineProcfilerTestWithGold : OnlineProcfilerTestBase
   protected void Execute(Func<string> goldCreator)
   {
     var testValue = goldCreator().RemoveRn();
-    GoldUtil.ExecuteGoldTest(testValue, GetType().Name, () =>
+    var folderName = GetType().Name;
+    var solution = TestContext.CurrentContext.Test.Arguments.FirstOrDefault() as KnownSolution;
+
+    if (solution is { })
+    {
+      folderName = Path.Combine(folderName, solution.Tfm);
+    }
+
+    GoldUtil.ExecuteGoldTest(testValue, folderName, () =>
     {
-      return TestContext.CurrentContext.Test.Arguments.FirstOrDefault() switch
+      return solution switch
       {
-        KnownSolution solution => solution.Name,
+        { } => solution.Name,
         _ => TestContext.CurrentContext.Test.Name
       };
     });

From a27a14b69fcc6657076c66e650a2813bd46b22ac Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Fri, 1 May 2026 21:48:45 +0300
Subject: [PATCH 10/53] Moving gold to new tfm folders

---
 .../AsyncMethodsGroupingTest/{ => net10.0}/TestAsyncAwait.gold    | 0
 .../{ => net10.0}/TestAsyncAwaitTaskFactoryNew.gold               | 0
 .../{ => net10.0}/TestAsyncDisposable.gold                        | 0
 .../AsyncMethodsGroupingTest/{ => net10.0}/TestAwaitForeach.gold  | 0
 .../{ => net10.0}/TestNotSimpleAsync.gold                         | 0
 .../{ => net10.0}/TestSimpleAsyncAwait.gold                       | 0
 .../windows/ByMethodSplitTests/{ => net10.0}/ConsoleApp1.gold     | 0
 .../ByMethodSplitTests/{ => net10.0}/DynamicAssemblyCreation.gold | 0
 .../ByMethodSplitTests/{ => net10.0}/DynamicAssemblyLoading.gold  | 0
 .../{ => net10.0}/ExceptionTryCatchFinally.gold                   | 0
 .../{ => net10.0}/ExceptionTryCatchFinallyWhen.gold               | 0
 .../ByMethodSplitTests/{ => net10.0}/FileWriteProject.gold        | 0
 .../ByMethodSplitTests/{ => net10.0}/FinalizableObject.gold       | 0
 .../ByMethodSplitTests/{ => net10.0}/IntensiveThreadPoolUse.gold  | 0
 .../windows/ByMethodSplitTests/{ => net10.0}/LOHAllocations.gold  | 0
 .../{ => net10.0}/NotExistingAssemblyLoading.gold                 | 0
 .../gold/windows/ByMethodSplitTests/{ => net10.0}/Sockets.gold    | 0
 .../ByMethodSplitTests/{ => net10.0}/SystemArrayPooling.gold      | 0
 .../ByMethodSplitTests/{ => net10.0}/TaskTestProject1.gold        | 0
 .../windows/ByMethodSplitTests/{ => net10.0}/UnsafeFixed.gold     | 0
 .../ByMethodSplitTestsNoInline/{ => net10.0}/ConsoleApp1.gold     | 0
 .../{ => net10.0}/DynamicAssemblyCreation.gold                    | 0
 .../{ => net10.0}/DynamicAssemblyLoading.gold                     | 0
 .../{ => net10.0}/ExceptionTryCatchFinally.gold                   | 0
 .../{ => net10.0}/ExceptionTryCatchFinallyWhen.gold               | 0
 .../{ => net10.0}/FileWriteProject.gold                           | 0
 .../{ => net10.0}/FinalizableObject.gold                          | 0
 .../{ => net10.0}/IntensiveThreadPoolUse.gold                     | 0
 .../ByMethodSplitTestsNoInline/{ => net10.0}/LOHAllocations.gold  | 0
 .../{ => net10.0}/NotExistingAssemblyLoading.gold                 | 0
 .../{ => net10.0}/SystemArrayPooling.gold                         | 0
 .../{ => net10.0}/TaskTestProject1.gold                           | 0
 .../ByMethodSplitTestsNoInline/{ => net10.0}/UnsafeFixed.gold     | 0
 .../{ => net10.0}/ConsoleApp1.gold                                | 0
 .../{ => net10.0}/DynamicAssemblyCreation.gold                    | 0
 .../{ => net10.0}/DynamicAssemblyLoading.gold                     | 0
 .../{ => net10.0}/ExceptionTryCatchFinally.gold                   | 0
 .../{ => net10.0}/ExceptionTryCatchFinallyWhen.gold               | 0
 .../{ => net10.0}/FileWriteProject.gold                           | 0
 .../{ => net10.0}/FinalizableObject.gold                          | 0
 .../{ => net10.0}/IntensiveThreadPoolUse.gold                     | 0
 .../{ => net10.0}/LOHAllocations.gold                             | 0
 .../{ => net10.0}/NotExistingAssemblyLoading.gold                 | 0
 .../{ => net10.0}/SystemArrayPooling.gold                         | 0
 .../{ => net10.0}/TaskTestProject1.gold                           | 0
 .../{ => net10.0}/UnsafeFixed.gold                                | 0
 .../windows/MethodsStartEndTests/{ => net10.0}/ConsoleApp1.gold   | 0
 .../{ => net10.0}/DynamicAssemblyCreation.gold                    | 0
 .../{ => net10.0}/DynamicAssemblyLoading.gold                     | 0
 .../{ => net10.0}/ExceptionTryCatchFinally.gold                   | 0
 .../{ => net10.0}/ExceptionTryCatchFinallyWhen.gold               | 0
 .../MethodsStartEndTests/{ => net10.0}/FileWriteProject.gold      | 0
 .../MethodsStartEndTests/{ => net10.0}/FinalizableObject.gold     | 0
 .../{ => net10.0}/IntensiveThreadPoolUse.gold                     | 0
 .../MethodsStartEndTests/{ => net10.0}/LOHAllocations.gold        | 0
 .../{ => net10.0}/NotExistingAssemblyLoading.gold                 | 0
 .../gold/windows/MethodsStartEndTests/{ => net10.0}/Sockets.gold  | 0
 .../MethodsStartEndTests/{ => net10.0}/SystemArrayPooling.gold    | 0
 .../MethodsStartEndTests/{ => net10.0}/TaskTestProject1.gold      | 0
 .../windows/MethodsStartEndTests/{ => net10.0}/UnsafeFixed.gold   | 0
 .../gold/windows/OcelEventsTest/{ => net10.0}/SimpleTest.gold     | 0
 .../gold/windows/OcelEventsTest/{ => net10.0}/SimpleTest2.gold    | 0
 .../gold/windows/OcelEventsTest/{ => net10.0}/SimpleTest3.gold    | 0
 .../OnlineAsyncMethodsGroupingTests/{ => net10.0}/AsyncAwait.gold | 0
 .../{ => net10.0}/AsyncAwaitTaskFactoryNew.gold                   | 0
 .../{ => net10.0}/AsyncDisposable.gold                            | 0
 .../{ => net10.0}/AwaitForeach.gold                               | 0
 .../{ => net10.0}/NotSimpleAsyncAwait.gold                        | 0
 .../{ => net10.0}/SimpleAsyncAwait.gold                           | 0
 .../OnlineProcfilerKafkaTests/{ => net10.0}/AllSolutionsTest.gold | 0
 .../ProcfilerEventPipeLoggerTest/{ => net10.0}/DoTest.gold        | 0
 71 files changed, 0 insertions(+), 0 deletions(-)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/{ => net10.0}/TestAsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/{ => net10.0}/TestAsyncAwaitTaskFactoryNew.gold (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/{ => net10.0}/TestAsyncDisposable.gold (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/{ => net10.0}/TestAwaitForeach.gold (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/{ => net10.0}/TestNotSimpleAsync.gold (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/{ => net10.0}/TestSimpleAsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTests/{ => net10.0}/ConsoleApp1.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTests/{ => net10.0}/DynamicAssemblyCreation.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTests/{ => net10.0}/DynamicAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTests/{ => net10.0}/ExceptionTryCatchFinally.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTests/{ => net10.0}/ExceptionTryCatchFinallyWhen.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTests/{ => net10.0}/FileWriteProject.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTests/{ => net10.0}/FinalizableObject.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTests/{ => net10.0}/IntensiveThreadPoolUse.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTests/{ => net10.0}/LOHAllocations.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTests/{ => net10.0}/NotExistingAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTests/{ => net10.0}/Sockets.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTests/{ => net10.0}/SystemArrayPooling.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTests/{ => net10.0}/TaskTestProject1.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTests/{ => net10.0}/UnsafeFixed.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/{ => net10.0}/ConsoleApp1.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/{ => net10.0}/DynamicAssemblyCreation.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/{ => net10.0}/DynamicAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/{ => net10.0}/ExceptionTryCatchFinally.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/{ => net10.0}/ExceptionTryCatchFinallyWhen.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/{ => net10.0}/FileWriteProject.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/{ => net10.0}/FinalizableObject.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/{ => net10.0}/IntensiveThreadPoolUse.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/{ => net10.0}/LOHAllocations.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/{ => net10.0}/NotExistingAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/{ => net10.0}/SystemArrayPooling.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/{ => net10.0}/TaskTestProject1.gold (100%)
 rename Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/{ => net10.0}/UnsafeFixed.gold (100%)
 rename Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/{ => net10.0}/ConsoleApp1.gold (100%)
 rename Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/{ => net10.0}/DynamicAssemblyCreation.gold (100%)
 rename Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/{ => net10.0}/DynamicAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/{ => net10.0}/ExceptionTryCatchFinally.gold (100%)
 rename Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/{ => net10.0}/ExceptionTryCatchFinallyWhen.gold (100%)
 rename Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/{ => net10.0}/FileWriteProject.gold (100%)
 rename Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/{ => net10.0}/FinalizableObject.gold (100%)
 rename Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/{ => net10.0}/IntensiveThreadPoolUse.gold (100%)
 rename Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/{ => net10.0}/LOHAllocations.gold (100%)
 rename Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/{ => net10.0}/NotExistingAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/{ => net10.0}/SystemArrayPooling.gold (100%)
 rename Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/{ => net10.0}/TaskTestProject1.gold (100%)
 rename Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/{ => net10.0}/UnsafeFixed.gold (100%)
 rename Procfiler/test_data/gold/windows/MethodsStartEndTests/{ => net10.0}/ConsoleApp1.gold (100%)
 rename Procfiler/test_data/gold/windows/MethodsStartEndTests/{ => net10.0}/DynamicAssemblyCreation.gold (100%)
 rename Procfiler/test_data/gold/windows/MethodsStartEndTests/{ => net10.0}/DynamicAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/windows/MethodsStartEndTests/{ => net10.0}/ExceptionTryCatchFinally.gold (100%)
 rename Procfiler/test_data/gold/windows/MethodsStartEndTests/{ => net10.0}/ExceptionTryCatchFinallyWhen.gold (100%)
 rename Procfiler/test_data/gold/windows/MethodsStartEndTests/{ => net10.0}/FileWriteProject.gold (100%)
 rename Procfiler/test_data/gold/windows/MethodsStartEndTests/{ => net10.0}/FinalizableObject.gold (100%)
 rename Procfiler/test_data/gold/windows/MethodsStartEndTests/{ => net10.0}/IntensiveThreadPoolUse.gold (100%)
 rename Procfiler/test_data/gold/windows/MethodsStartEndTests/{ => net10.0}/LOHAllocations.gold (100%)
 rename Procfiler/test_data/gold/windows/MethodsStartEndTests/{ => net10.0}/NotExistingAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/windows/MethodsStartEndTests/{ => net10.0}/Sockets.gold (100%)
 rename Procfiler/test_data/gold/windows/MethodsStartEndTests/{ => net10.0}/SystemArrayPooling.gold (100%)
 rename Procfiler/test_data/gold/windows/MethodsStartEndTests/{ => net10.0}/TaskTestProject1.gold (100%)
 rename Procfiler/test_data/gold/windows/MethodsStartEndTests/{ => net10.0}/UnsafeFixed.gold (100%)
 rename Procfiler/test_data/gold/windows/OcelEventsTest/{ => net10.0}/SimpleTest.gold (100%)
 rename Procfiler/test_data/gold/windows/OcelEventsTest/{ => net10.0}/SimpleTest2.gold (100%)
 rename Procfiler/test_data/gold/windows/OcelEventsTest/{ => net10.0}/SimpleTest3.gold (100%)
 rename Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/{ => net10.0}/AsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/{ => net10.0}/AsyncAwaitTaskFactoryNew.gold (100%)
 rename Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/{ => net10.0}/AsyncDisposable.gold (100%)
 rename Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/{ => net10.0}/AwaitForeach.gold (100%)
 rename Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/{ => net10.0}/NotSimpleAsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/{ => net10.0}/SimpleAsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/{ => net10.0}/AllSolutionsTest.gold (100%)
 rename Procfiler/test_data/gold/windows/ProcfilerEventPipeLoggerTest/{ => net10.0}/DoTest.gold (100%)

diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/TestAsyncAwait.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/TestAsyncAwait.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/TestAsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/TestAsyncDisposable.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/TestAsyncDisposable.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/TestAwaitForeach.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/TestAwaitForeach.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAwaitForeach.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestNotSimpleAsync.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/TestNotSimpleAsync.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestNotSimpleAsync.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/TestSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestSimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/ConsoleApp1.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/ConsoleApp1.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTests/ConsoleApp1.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/ConsoleApp1.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/DynamicAssemblyCreation.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTests/DynamicAssemblyCreation.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/DynamicAssemblyCreation.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/DynamicAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTests/DynamicAssemblyLoading.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/DynamicAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/ExceptionTryCatchFinally.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTests/ExceptionTryCatchFinally.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/ExceptionTryCatchFinally.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/ExceptionTryCatchFinallyWhen.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTests/ExceptionTryCatchFinallyWhen.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/ExceptionTryCatchFinallyWhen.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/FileWriteProject.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/FileWriteProject.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTests/FileWriteProject.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/FileWriteProject.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/FinalizableObject.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/FinalizableObject.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTests/FinalizableObject.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/FinalizableObject.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/IntensiveThreadPoolUse.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTests/IntensiveThreadPoolUse.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/IntensiveThreadPoolUse.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/LOHAllocations.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/LOHAllocations.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTests/LOHAllocations.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/LOHAllocations.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/NotExistingAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTests/NotExistingAssemblyLoading.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/NotExistingAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/Sockets.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/Sockets.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTests/Sockets.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/Sockets.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/SystemArrayPooling.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/SystemArrayPooling.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTests/SystemArrayPooling.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/SystemArrayPooling.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/TaskTestProject1.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/TaskTestProject1.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTests/TaskTestProject1.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/TaskTestProject1.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/UnsafeFixed.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/UnsafeFixed.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTests/UnsafeFixed.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTests/net10.0/UnsafeFixed.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/ConsoleApp1.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/ConsoleApp1.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/ConsoleApp1.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/ConsoleApp1.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/DynamicAssemblyCreation.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/DynamicAssemblyCreation.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/DynamicAssemblyCreation.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/DynamicAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/DynamicAssemblyLoading.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/DynamicAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/ExceptionTryCatchFinally.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/ExceptionTryCatchFinally.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/ExceptionTryCatchFinally.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/ExceptionTryCatchFinallyWhen.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/ExceptionTryCatchFinallyWhen.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/ExceptionTryCatchFinallyWhen.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/FileWriteProject.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/FileWriteProject.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/FileWriteProject.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/FileWriteProject.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/FinalizableObject.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/FinalizableObject.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/FinalizableObject.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/FinalizableObject.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/IntensiveThreadPoolUse.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/IntensiveThreadPoolUse.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/IntensiveThreadPoolUse.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/LOHAllocations.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/LOHAllocations.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/LOHAllocations.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/LOHAllocations.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/NotExistingAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/NotExistingAssemblyLoading.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/NotExistingAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/SystemArrayPooling.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/SystemArrayPooling.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/SystemArrayPooling.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/SystemArrayPooling.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/TaskTestProject1.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/TaskTestProject1.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/TaskTestProject1.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/TaskTestProject1.gold
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/UnsafeFixed.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/UnsafeFixed.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/UnsafeFixed.gold
rename to Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net10.0/UnsafeFixed.gold
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/ConsoleApp1.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/ConsoleApp1.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/ConsoleApp1.gold
rename to Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/ConsoleApp1.gold
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/DynamicAssemblyCreation.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/DynamicAssemblyCreation.gold
rename to Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/DynamicAssemblyCreation.gold
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/DynamicAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/DynamicAssemblyLoading.gold
rename to Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/DynamicAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/ExceptionTryCatchFinally.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/ExceptionTryCatchFinally.gold
rename to Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/ExceptionTryCatchFinally.gold
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/ExceptionTryCatchFinallyWhen.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/ExceptionTryCatchFinallyWhen.gold
rename to Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/ExceptionTryCatchFinallyWhen.gold
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/FileWriteProject.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/FileWriteProject.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/FileWriteProject.gold
rename to Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/FileWriteProject.gold
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/FinalizableObject.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/FinalizableObject.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/FinalizableObject.gold
rename to Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/FinalizableObject.gold
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/IntensiveThreadPoolUse.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/IntensiveThreadPoolUse.gold
rename to Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/IntensiveThreadPoolUse.gold
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/LOHAllocations.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/LOHAllocations.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/LOHAllocations.gold
rename to Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/LOHAllocations.gold
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/NotExistingAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/NotExistingAssemblyLoading.gold
rename to Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/NotExistingAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/SystemArrayPooling.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/SystemArrayPooling.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/SystemArrayPooling.gold
rename to Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/SystemArrayPooling.gold
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/TaskTestProject1.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/TaskTestProject1.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/TaskTestProject1.gold
rename to Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/TaskTestProject1.gold
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/UnsafeFixed.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/UnsafeFixed.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/UnsafeFixed.gold
rename to Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net10.0/UnsafeFixed.gold
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/ConsoleApp1.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/ConsoleApp1.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/MethodsStartEndTests/ConsoleApp1.gold
rename to Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/ConsoleApp1.gold
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/DynamicAssemblyCreation.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/MethodsStartEndTests/DynamicAssemblyCreation.gold
rename to Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/DynamicAssemblyCreation.gold
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/DynamicAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/MethodsStartEndTests/DynamicAssemblyLoading.gold
rename to Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/DynamicAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/ExceptionTryCatchFinally.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/MethodsStartEndTests/ExceptionTryCatchFinally.gold
rename to Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/ExceptionTryCatchFinally.gold
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/ExceptionTryCatchFinallyWhen.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/MethodsStartEndTests/ExceptionTryCatchFinallyWhen.gold
rename to Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/ExceptionTryCatchFinallyWhen.gold
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/FileWriteProject.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/FileWriteProject.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/MethodsStartEndTests/FileWriteProject.gold
rename to Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/FileWriteProject.gold
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/FinalizableObject.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/FinalizableObject.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/MethodsStartEndTests/FinalizableObject.gold
rename to Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/FinalizableObject.gold
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/IntensiveThreadPoolUse.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/MethodsStartEndTests/IntensiveThreadPoolUse.gold
rename to Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/IntensiveThreadPoolUse.gold
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/LOHAllocations.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/LOHAllocations.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/MethodsStartEndTests/LOHAllocations.gold
rename to Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/LOHAllocations.gold
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/NotExistingAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/MethodsStartEndTests/NotExistingAssemblyLoading.gold
rename to Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/NotExistingAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/Sockets.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/Sockets.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/MethodsStartEndTests/Sockets.gold
rename to Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/Sockets.gold
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/SystemArrayPooling.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/SystemArrayPooling.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/MethodsStartEndTests/SystemArrayPooling.gold
rename to Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/SystemArrayPooling.gold
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/TaskTestProject1.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/TaskTestProject1.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/MethodsStartEndTests/TaskTestProject1.gold
rename to Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/TaskTestProject1.gold
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/UnsafeFixed.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/UnsafeFixed.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/MethodsStartEndTests/UnsafeFixed.gold
rename to Procfiler/test_data/gold/windows/MethodsStartEndTests/net10.0/UnsafeFixed.gold
diff --git a/Procfiler/test_data/gold/windows/OcelEventsTest/SimpleTest.gold b/Procfiler/test_data/gold/windows/OcelEventsTest/net10.0/SimpleTest.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/OcelEventsTest/SimpleTest.gold
rename to Procfiler/test_data/gold/windows/OcelEventsTest/net10.0/SimpleTest.gold
diff --git a/Procfiler/test_data/gold/windows/OcelEventsTest/SimpleTest2.gold b/Procfiler/test_data/gold/windows/OcelEventsTest/net10.0/SimpleTest2.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/OcelEventsTest/SimpleTest2.gold
rename to Procfiler/test_data/gold/windows/OcelEventsTest/net10.0/SimpleTest2.gold
diff --git a/Procfiler/test_data/gold/windows/OcelEventsTest/SimpleTest3.gold b/Procfiler/test_data/gold/windows/OcelEventsTest/net10.0/SimpleTest3.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/OcelEventsTest/SimpleTest3.gold
rename to Procfiler/test_data/gold/windows/OcelEventsTest/net10.0/SimpleTest3.gold
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/AsyncAwait.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net10.0/AsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/AsyncAwait.gold
rename to Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net10.0/AsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/AsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net10.0/AsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/AsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net10.0/AsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/AsyncDisposable.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net10.0/AsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/AsyncDisposable.gold
rename to Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net10.0/AsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/AwaitForeach.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net10.0/AwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/AwaitForeach.gold
rename to Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net10.0/AwaitForeach.gold
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/NotSimpleAsyncAwait.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net10.0/NotSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/NotSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net10.0/NotSimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/SimpleAsyncAwait.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net10.0/SimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/SimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net10.0/SimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/AllSolutionsTest.gold b/Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/net10.0/AllSolutionsTest.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/AllSolutionsTest.gold
rename to Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/net10.0/AllSolutionsTest.gold
diff --git a/Procfiler/test_data/gold/windows/ProcfilerEventPipeLoggerTest/DoTest.gold b/Procfiler/test_data/gold/windows/ProcfilerEventPipeLoggerTest/net10.0/DoTest.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ProcfilerEventPipeLoggerTest/DoTest.gold
rename to Procfiler/test_data/gold/windows/ProcfilerEventPipeLoggerTest/net10.0/DoTest.gold

From 145f23f7bac8e82bddfa190d923beddcb7859f8d Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sat, 2 May 2026 11:54:10 +0300
Subject: [PATCH 11/53] Fix OnlineProcfiler async methods grouping test

---
 .../Tests/OnlineAsyncMethodsGroupingTests.cs  | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/Procfiler/src/dotnet/OnlineProcfilerTests/Tests/OnlineAsyncMethodsGroupingTests.cs b/Procfiler/src/dotnet/OnlineProcfilerTests/Tests/OnlineAsyncMethodsGroupingTests.cs
index d28a660b7..129e9df7e 100644
--- a/Procfiler/src/dotnet/OnlineProcfilerTests/Tests/OnlineAsyncMethodsGroupingTests.cs
+++ b/Procfiler/src/dotnet/OnlineProcfilerTests/Tests/OnlineAsyncMethodsGroupingTests.cs
@@ -25,6 +25,17 @@ public void Handle(IEventPipeStreamEvent eventPipeStreamEvent)
 [NonParallelizable]
 public class OnlineAsyncMethodsGroupingTests : OnlineProcfilerMethodsTest
 {
+  private static IEnumerable<KnownSolution> ourAsyncSolutions =
+  [
+    KnownSolution.SimpleAsyncAwait,
+    KnownSolution.NotSimpleAsyncAwait,
+    KnownSolution.AsyncAwait,
+    KnownSolution.AsyncDisposable,
+    KnownSolution.AwaitForeach,
+    KnownSolution.AsyncAwaitTaskFactoryNew
+  ];
+
+
   private readonly TestAsyncMethodsHandler myHandler = new();
 
   protected override IEnumerable<IEventPipeStreamEventHandler> HandlersToRegister =>
@@ -35,24 +46,8 @@ public class OnlineAsyncMethodsGroupingTests : OnlineProcfilerMethodsTest
   protected override string? Prefix => null;
 
 
-  [Test]
-  public void SimpleAsyncAwait() => Execute(() => DoExecuteTest(KnownSolution.SimpleAsyncAwait));
-
-  [Test]
-  public void NotSimpleAsyncAwait() => Execute(() => DoExecuteTest(KnownSolution.NotSimpleAsyncAwait));
-
-  [Test]
-  public void AsyncAwait() => Execute(() => DoExecuteTest(KnownSolution.AsyncAwait));
-
-  [Test]
-  public void AsyncDisposable() => Execute(() => DoExecuteTest(KnownSolution.AsyncDisposable));
-
-  [Test]
-  public void AwaitForeach() => Execute(() => DoExecuteTest(KnownSolution.AwaitForeach));
-
-  [Test]
-  public void AsyncAwaitTaskFactoryNew() => Execute(() => DoExecuteTest(KnownSolution.AsyncAwaitTaskFactoryNew));
-
+  [TestCaseSource(nameof(ourAsyncSolutions))]
+  public void DoTest(KnownSolution solution) => Execute(() => DoExecuteTest(solution));
 
   protected override Dictionary<string, List<List<EventRecordWithMetadata>>> GetLoggedMethods(ISharedEventPipeStreamData data) =>
     myHandler.RecordedStateMachineTraces;

From c91681c2697dd4e83e10d7e1269494a16f23a572 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sat, 2 May 2026 12:19:27 +0300
Subject: [PATCH 12/53] Moving tests to tfm folders

---
 .../AsyncMethodsGroupingTest/{ => net10.0}/TestAsyncAwait.gold    | 0
 .../{ => net10.0}/TestAsyncAwaitTaskFactoryNew.gold               | 0
 .../{ => net10.0}/TestAsyncDisposable.gold                        | 0
 .../AsyncMethodsGroupingTest/{ => net10.0}/TestAwaitForeach.gold  | 0
 .../{ => net10.0}/TestNotSimpleAsync.gold                         | 0
 .../{ => net10.0}/TestSimpleAsyncAwait.gold                       | 0
 .../gold/linux/ByMethodSplitTests/{ => net10.0}/ConsoleApp1.gold  | 0
 .../ByMethodSplitTests/{ => net10.0}/DynamicAssemblyCreation.gold | 0
 .../ByMethodSplitTests/{ => net10.0}/DynamicAssemblyLoading.gold  | 0
 .../{ => net10.0}/ExceptionTryCatchFinally.gold                   | 0
 .../{ => net10.0}/ExceptionTryCatchFinallyWhen.gold               | 0
 .../linux/ByMethodSplitTests/{ => net10.0}/FileWriteProject.gold  | 0
 .../linux/ByMethodSplitTests/{ => net10.0}/FinalizableObject.gold | 0
 .../ByMethodSplitTests/{ => net10.0}/IntensiveThreadPoolUse.gold  | 0
 .../linux/ByMethodSplitTests/{ => net10.0}/LOHAllocations.gold    | 0
 .../{ => net10.0}/NotExistingAssemblyLoading.gold                 | 0
 .../ByMethodSplitTests/{ => net10.0}/SystemArrayPooling.gold      | 0
 .../linux/ByMethodSplitTests/{ => net10.0}/TaskTestProject1.gold  | 0
 .../gold/linux/ByMethodSplitTests/{ => net10.0}/UnsafeFixed.gold  | 0
 .../ByMethodSplitTestsNoInline/{ => net10.0}/ConsoleApp1.gold     | 0
 .../{ => net10.0}/DynamicAssemblyCreation.gold                    | 0
 .../{ => net10.0}/DynamicAssemblyLoading.gold                     | 0
 .../{ => net10.0}/ExceptionTryCatchFinally.gold                   | 0
 .../{ => net10.0}/ExceptionTryCatchFinallyWhen.gold               | 0
 .../{ => net10.0}/FileWriteProject.gold                           | 0
 .../{ => net10.0}/FinalizableObject.gold                          | 0
 .../{ => net10.0}/IntensiveThreadPoolUse.gold                     | 0
 .../ByMethodSplitTestsNoInline/{ => net10.0}/LOHAllocations.gold  | 0
 .../{ => net10.0}/NotExistingAssemblyLoading.gold                 | 0
 .../{ => net10.0}/SystemArrayPooling.gold                         | 0
 .../{ => net10.0}/TaskTestProject1.gold                           | 0
 .../ByMethodSplitTestsNoInline/{ => net10.0}/UnsafeFixed.gold     | 0
 .../{ => net10.0}/ConsoleApp1.gold                                | 0
 .../{ => net10.0}/DynamicAssemblyCreation.gold                    | 0
 .../{ => net10.0}/DynamicAssemblyLoading.gold                     | 0
 .../{ => net10.0}/ExceptionTryCatchFinally.gold                   | 0
 .../{ => net10.0}/ExceptionTryCatchFinallyWhen.gold               | 0
 .../{ => net10.0}/FileWriteProject.gold                           | 0
 .../{ => net10.0}/FinalizableObject.gold                          | 0
 .../{ => net10.0}/IntensiveThreadPoolUse.gold                     | 0
 .../{ => net10.0}/LOHAllocations.gold                             | 0
 .../{ => net10.0}/NotExistingAssemblyLoading.gold                 | 0
 .../{ => net10.0}/SystemArrayPooling.gold                         | 0
 .../{ => net10.0}/TaskTestProject1.gold                           | 0
 .../{ => net10.0}/UnsafeFixed.gold                                | 0
 .../linux/MethodsStartEndTests/{ => net10.0}/ConsoleApp1.gold     | 0
 .../{ => net10.0}/DynamicAssemblyCreation.gold                    | 0
 .../{ => net10.0}/DynamicAssemblyLoading.gold                     | 0
 .../{ => net10.0}/ExceptionTryCatchFinally.gold                   | 0
 .../{ => net10.0}/ExceptionTryCatchFinallyWhen.gold               | 0
 .../MethodsStartEndTests/{ => net10.0}/FileWriteProject.gold      | 0
 .../MethodsStartEndTests/{ => net10.0}/FinalizableObject.gold     | 0
 .../{ => net10.0}/IntensiveThreadPoolUse.gold                     | 0
 .../linux/MethodsStartEndTests/{ => net10.0}/LOHAllocations.gold  | 0
 .../{ => net10.0}/NotExistingAssemblyLoading.gold                 | 0
 .../gold/linux/MethodsStartEndTests/{ => net10.0}/Sockets.gold    | 0
 .../MethodsStartEndTests/{ => net10.0}/SystemArrayPooling.gold    | 0
 .../MethodsStartEndTests/{ => net10.0}/TaskTestProject1.gold      | 0
 .../linux/MethodsStartEndTests/{ => net10.0}/UnsafeFixed.gold     | 0
 .../gold/linux/OcelEventsTest/{ => net10.0}/SimpleTest.gold       | 0
 .../gold/linux/OcelEventsTest/{ => net10.0}/SimpleTest2.gold      | 0
 .../gold/linux/OcelEventsTest/{ => net10.0}/SimpleTest3.gold      | 0
 .../OnlineAsyncMethodsGroupingTests/{ => net10.0}/AsyncAwait.gold | 0
 .../{ => net10.0}/AsyncAwaitTaskFactoryNew.gold                   | 0
 .../{ => net10.0}/AsyncDisposable.gold                            | 0
 .../{ => net10.0}/AwaitForeach.gold                               | 0
 .../{ => net10.0}/NotSimpleAsyncAwait.gold                        | 0
 .../{ => net10.0}/SimpleAsyncAwait.gold                           | 0
 .../AsyncMethodsGroupingTest/{ => net10.0}/TestAsyncAwait.gold    | 0
 .../{ => net10.0}/TestAsyncAwaitTaskFactoryNew.gold               | 0
 .../{ => net10.0}/TestAsyncDisposable.gold                        | 0
 .../AsyncMethodsGroupingTest/{ => net10.0}/TestAwaitForeach.gold  | 0
 .../{ => net10.0}/TestNotSimpleAsync.gold                         | 0
 .../{ => net10.0}/TestSimpleAsyncAwait.gold                       | 0
 .../gold/macos/ByMethodSplitTests/{ => net10.0}/ConsoleApp1.gold  | 0
 .../ByMethodSplitTests/{ => net10.0}/DynamicAssemblyCreation.gold | 0
 .../ByMethodSplitTests/{ => net10.0}/DynamicAssemblyLoading.gold  | 0
 .../{ => net10.0}/ExceptionTryCatchFinally.gold                   | 0
 .../{ => net10.0}/ExceptionTryCatchFinallyWhen.gold               | 0
 .../macos/ByMethodSplitTests/{ => net10.0}/FileWriteProject.gold  | 0
 .../macos/ByMethodSplitTests/{ => net10.0}/FinalizableObject.gold | 0
 .../ByMethodSplitTests/{ => net10.0}/IntensiveThreadPoolUse.gold  | 0
 .../macos/ByMethodSplitTests/{ => net10.0}/LOHAllocations.gold    | 0
 .../{ => net10.0}/NotExistingAssemblyLoading.gold                 | 0
 .../ByMethodSplitTests/{ => net10.0}/SystemArrayPooling.gold      | 0
 .../macos/ByMethodSplitTests/{ => net10.0}/TaskTestProject1.gold  | 0
 .../gold/macos/ByMethodSplitTests/{ => net10.0}/UnsafeFixed.gold  | 0
 .../ByMethodSplitTestsNoInline/{ => net10.0}/ConsoleApp1.gold     | 0
 .../{ => net10.0}/DynamicAssemblyCreation.gold                    | 0
 .../{ => net10.0}/DynamicAssemblyLoading.gold                     | 0
 .../{ => net10.0}/ExceptionTryCatchFinally.gold                   | 0
 .../{ => net10.0}/ExceptionTryCatchFinallyWhen.gold               | 0
 .../{ => net10.0}/FileWriteProject.gold                           | 0
 .../{ => net10.0}/FinalizableObject.gold                          | 0
 .../{ => net10.0}/IntensiveThreadPoolUse.gold                     | 0
 .../ByMethodSplitTestsNoInline/{ => net10.0}/LOHAllocations.gold  | 0
 .../{ => net10.0}/NotExistingAssemblyLoading.gold                 | 0
 .../{ => net10.0}/SystemArrayPooling.gold                         | 0
 .../{ => net10.0}/TaskTestProject1.gold                           | 0
 .../ByMethodSplitTestsNoInline/{ => net10.0}/UnsafeFixed.gold     | 0
 .../{ => net10.0}/ConsoleApp1.gold                                | 0
 .../{ => net10.0}/DynamicAssemblyCreation.gold                    | 0
 .../{ => net10.0}/DynamicAssemblyLoading.gold                     | 0
 .../{ => net10.0}/ExceptionTryCatchFinally.gold                   | 0
 .../{ => net10.0}/ExceptionTryCatchFinallyWhen.gold               | 0
 .../{ => net10.0}/FileWriteProject.gold                           | 0
 .../{ => net10.0}/FinalizableObject.gold                          | 0
 .../{ => net10.0}/IntensiveThreadPoolUse.gold                     | 0
 .../{ => net10.0}/LOHAllocations.gold                             | 0
 .../{ => net10.0}/NotExistingAssemblyLoading.gold                 | 0
 .../{ => net10.0}/SystemArrayPooling.gold                         | 0
 .../{ => net10.0}/TaskTestProject1.gold                           | 0
 .../{ => net10.0}/UnsafeFixed.gold                                | 0
 .../macos/MethodsStartEndTests/{ => net10.0}/ConsoleApp1.gold     | 0
 .../{ => net10.0}/DynamicAssemblyCreation.gold                    | 0
 .../{ => net10.0}/DynamicAssemblyLoading.gold                     | 0
 .../{ => net10.0}/ExceptionTryCatchFinally.gold                   | 0
 .../{ => net10.0}/ExceptionTryCatchFinallyWhen.gold               | 0
 .../MethodsStartEndTests/{ => net10.0}/FileWriteProject.gold      | 0
 .../MethodsStartEndTests/{ => net10.0}/FinalizableObject.gold     | 0
 .../{ => net10.0}/IntensiveThreadPoolUse.gold                     | 0
 .../macos/MethodsStartEndTests/{ => net10.0}/LOHAllocations.gold  | 0
 .../{ => net10.0}/NotExistingAssemblyLoading.gold                 | 0
 .../gold/macos/MethodsStartEndTests/{ => net10.0}/Sockets.gold    | 0
 .../MethodsStartEndTests/{ => net10.0}/SystemArrayPooling.gold    | 0
 .../MethodsStartEndTests/{ => net10.0}/TaskTestProject1.gold      | 0
 .../macos/MethodsStartEndTests/{ => net10.0}/UnsafeFixed.gold     | 0
 .../gold/macos/OcelEventsTest/{ => net10.0}/SimpleTest.gold       | 0
 .../gold/macos/OcelEventsTest/{ => net10.0}/SimpleTest2.gold      | 0
 .../gold/macos/OcelEventsTest/{ => net10.0}/SimpleTest3.gold      | 0
 .../OnlineAsyncMethodsGroupingTests/{ => net10.0}/AsyncAwait.gold | 0
 .../{ => net10.0}/AsyncAwaitTaskFactoryNew.gold                   | 0
 .../{ => net10.0}/AsyncDisposable.gold                            | 0
 .../{ => net10.0}/AwaitForeach.gold                               | 0
 .../{ => net10.0}/NotSimpleAsyncAwait.gold                        | 0
 .../{ => net10.0}/SimpleAsyncAwait.gold                           | 0
 .../OnlineProcfilerKafkaTests/{net10.0 => }/AllSolutionsTest.gold | 0
 .../ProcfilerEventPipeLoggerTest/{net10.0 => }/DoTest.gold        | 0
 138 files changed, 0 insertions(+), 0 deletions(-)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/{ => net10.0}/TestAsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/{ => net10.0}/TestAsyncAwaitTaskFactoryNew.gold (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/{ => net10.0}/TestAsyncDisposable.gold (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/{ => net10.0}/TestAwaitForeach.gold (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/{ => net10.0}/TestNotSimpleAsync.gold (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/{ => net10.0}/TestSimpleAsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTests/{ => net10.0}/ConsoleApp1.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTests/{ => net10.0}/DynamicAssemblyCreation.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTests/{ => net10.0}/DynamicAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTests/{ => net10.0}/ExceptionTryCatchFinally.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTests/{ => net10.0}/ExceptionTryCatchFinallyWhen.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTests/{ => net10.0}/FileWriteProject.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTests/{ => net10.0}/FinalizableObject.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTests/{ => net10.0}/IntensiveThreadPoolUse.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTests/{ => net10.0}/LOHAllocations.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTests/{ => net10.0}/NotExistingAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTests/{ => net10.0}/SystemArrayPooling.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTests/{ => net10.0}/TaskTestProject1.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTests/{ => net10.0}/UnsafeFixed.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/{ => net10.0}/ConsoleApp1.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/{ => net10.0}/DynamicAssemblyCreation.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/{ => net10.0}/DynamicAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/{ => net10.0}/ExceptionTryCatchFinally.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/{ => net10.0}/ExceptionTryCatchFinallyWhen.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/{ => net10.0}/FileWriteProject.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/{ => net10.0}/FinalizableObject.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/{ => net10.0}/IntensiveThreadPoolUse.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/{ => net10.0}/LOHAllocations.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/{ => net10.0}/NotExistingAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/{ => net10.0}/SystemArrayPooling.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/{ => net10.0}/TaskTestProject1.gold (100%)
 rename Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/{ => net10.0}/UnsafeFixed.gold (100%)
 rename Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/{ => net10.0}/ConsoleApp1.gold (100%)
 rename Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/{ => net10.0}/DynamicAssemblyCreation.gold (100%)
 rename Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/{ => net10.0}/DynamicAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/{ => net10.0}/ExceptionTryCatchFinally.gold (100%)
 rename Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/{ => net10.0}/ExceptionTryCatchFinallyWhen.gold (100%)
 rename Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/{ => net10.0}/FileWriteProject.gold (100%)
 rename Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/{ => net10.0}/FinalizableObject.gold (100%)
 rename Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/{ => net10.0}/IntensiveThreadPoolUse.gold (100%)
 rename Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/{ => net10.0}/LOHAllocations.gold (100%)
 rename Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/{ => net10.0}/NotExistingAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/{ => net10.0}/SystemArrayPooling.gold (100%)
 rename Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/{ => net10.0}/TaskTestProject1.gold (100%)
 rename Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/{ => net10.0}/UnsafeFixed.gold (100%)
 rename Procfiler/test_data/gold/linux/MethodsStartEndTests/{ => net10.0}/ConsoleApp1.gold (100%)
 rename Procfiler/test_data/gold/linux/MethodsStartEndTests/{ => net10.0}/DynamicAssemblyCreation.gold (100%)
 rename Procfiler/test_data/gold/linux/MethodsStartEndTests/{ => net10.0}/DynamicAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/linux/MethodsStartEndTests/{ => net10.0}/ExceptionTryCatchFinally.gold (100%)
 rename Procfiler/test_data/gold/linux/MethodsStartEndTests/{ => net10.0}/ExceptionTryCatchFinallyWhen.gold (100%)
 rename Procfiler/test_data/gold/linux/MethodsStartEndTests/{ => net10.0}/FileWriteProject.gold (100%)
 rename Procfiler/test_data/gold/linux/MethodsStartEndTests/{ => net10.0}/FinalizableObject.gold (100%)
 rename Procfiler/test_data/gold/linux/MethodsStartEndTests/{ => net10.0}/IntensiveThreadPoolUse.gold (100%)
 rename Procfiler/test_data/gold/linux/MethodsStartEndTests/{ => net10.0}/LOHAllocations.gold (100%)
 rename Procfiler/test_data/gold/linux/MethodsStartEndTests/{ => net10.0}/NotExistingAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/linux/MethodsStartEndTests/{ => net10.0}/Sockets.gold (100%)
 rename Procfiler/test_data/gold/linux/MethodsStartEndTests/{ => net10.0}/SystemArrayPooling.gold (100%)
 rename Procfiler/test_data/gold/linux/MethodsStartEndTests/{ => net10.0}/TaskTestProject1.gold (100%)
 rename Procfiler/test_data/gold/linux/MethodsStartEndTests/{ => net10.0}/UnsafeFixed.gold (100%)
 rename Procfiler/test_data/gold/linux/OcelEventsTest/{ => net10.0}/SimpleTest.gold (100%)
 rename Procfiler/test_data/gold/linux/OcelEventsTest/{ => net10.0}/SimpleTest2.gold (100%)
 rename Procfiler/test_data/gold/linux/OcelEventsTest/{ => net10.0}/SimpleTest3.gold (100%)
 rename Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/{ => net10.0}/AsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/{ => net10.0}/AsyncAwaitTaskFactoryNew.gold (100%)
 rename Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/{ => net10.0}/AsyncDisposable.gold (100%)
 rename Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/{ => net10.0}/AwaitForeach.gold (100%)
 rename Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/{ => net10.0}/NotSimpleAsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/{ => net10.0}/SimpleAsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/{ => net10.0}/TestAsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/{ => net10.0}/TestAsyncAwaitTaskFactoryNew.gold (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/{ => net10.0}/TestAsyncDisposable.gold (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/{ => net10.0}/TestAwaitForeach.gold (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/{ => net10.0}/TestNotSimpleAsync.gold (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/{ => net10.0}/TestSimpleAsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTests/{ => net10.0}/ConsoleApp1.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTests/{ => net10.0}/DynamicAssemblyCreation.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTests/{ => net10.0}/DynamicAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTests/{ => net10.0}/ExceptionTryCatchFinally.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTests/{ => net10.0}/ExceptionTryCatchFinallyWhen.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTests/{ => net10.0}/FileWriteProject.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTests/{ => net10.0}/FinalizableObject.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTests/{ => net10.0}/IntensiveThreadPoolUse.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTests/{ => net10.0}/LOHAllocations.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTests/{ => net10.0}/NotExistingAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTests/{ => net10.0}/SystemArrayPooling.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTests/{ => net10.0}/TaskTestProject1.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTests/{ => net10.0}/UnsafeFixed.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/{ => net10.0}/ConsoleApp1.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/{ => net10.0}/DynamicAssemblyCreation.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/{ => net10.0}/DynamicAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/{ => net10.0}/ExceptionTryCatchFinally.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/{ => net10.0}/ExceptionTryCatchFinallyWhen.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/{ => net10.0}/FileWriteProject.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/{ => net10.0}/FinalizableObject.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/{ => net10.0}/IntensiveThreadPoolUse.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/{ => net10.0}/LOHAllocations.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/{ => net10.0}/NotExistingAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/{ => net10.0}/SystemArrayPooling.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/{ => net10.0}/TaskTestProject1.gold (100%)
 rename Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/{ => net10.0}/UnsafeFixed.gold (100%)
 rename Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/{ => net10.0}/ConsoleApp1.gold (100%)
 rename Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/{ => net10.0}/DynamicAssemblyCreation.gold (100%)
 rename Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/{ => net10.0}/DynamicAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/{ => net10.0}/ExceptionTryCatchFinally.gold (100%)
 rename Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/{ => net10.0}/ExceptionTryCatchFinallyWhen.gold (100%)
 rename Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/{ => net10.0}/FileWriteProject.gold (100%)
 rename Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/{ => net10.0}/FinalizableObject.gold (100%)
 rename Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/{ => net10.0}/IntensiveThreadPoolUse.gold (100%)
 rename Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/{ => net10.0}/LOHAllocations.gold (100%)
 rename Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/{ => net10.0}/NotExistingAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/{ => net10.0}/SystemArrayPooling.gold (100%)
 rename Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/{ => net10.0}/TaskTestProject1.gold (100%)
 rename Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/{ => net10.0}/UnsafeFixed.gold (100%)
 rename Procfiler/test_data/gold/macos/MethodsStartEndTests/{ => net10.0}/ConsoleApp1.gold (100%)
 rename Procfiler/test_data/gold/macos/MethodsStartEndTests/{ => net10.0}/DynamicAssemblyCreation.gold (100%)
 rename Procfiler/test_data/gold/macos/MethodsStartEndTests/{ => net10.0}/DynamicAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/macos/MethodsStartEndTests/{ => net10.0}/ExceptionTryCatchFinally.gold (100%)
 rename Procfiler/test_data/gold/macos/MethodsStartEndTests/{ => net10.0}/ExceptionTryCatchFinallyWhen.gold (100%)
 rename Procfiler/test_data/gold/macos/MethodsStartEndTests/{ => net10.0}/FileWriteProject.gold (100%)
 rename Procfiler/test_data/gold/macos/MethodsStartEndTests/{ => net10.0}/FinalizableObject.gold (100%)
 rename Procfiler/test_data/gold/macos/MethodsStartEndTests/{ => net10.0}/IntensiveThreadPoolUse.gold (100%)
 rename Procfiler/test_data/gold/macos/MethodsStartEndTests/{ => net10.0}/LOHAllocations.gold (100%)
 rename Procfiler/test_data/gold/macos/MethodsStartEndTests/{ => net10.0}/NotExistingAssemblyLoading.gold (100%)
 rename Procfiler/test_data/gold/macos/MethodsStartEndTests/{ => net10.0}/Sockets.gold (100%)
 rename Procfiler/test_data/gold/macos/MethodsStartEndTests/{ => net10.0}/SystemArrayPooling.gold (100%)
 rename Procfiler/test_data/gold/macos/MethodsStartEndTests/{ => net10.0}/TaskTestProject1.gold (100%)
 rename Procfiler/test_data/gold/macos/MethodsStartEndTests/{ => net10.0}/UnsafeFixed.gold (100%)
 rename Procfiler/test_data/gold/macos/OcelEventsTest/{ => net10.0}/SimpleTest.gold (100%)
 rename Procfiler/test_data/gold/macos/OcelEventsTest/{ => net10.0}/SimpleTest2.gold (100%)
 rename Procfiler/test_data/gold/macos/OcelEventsTest/{ => net10.0}/SimpleTest3.gold (100%)
 rename Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/{ => net10.0}/AsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/{ => net10.0}/AsyncAwaitTaskFactoryNew.gold (100%)
 rename Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/{ => net10.0}/AsyncDisposable.gold (100%)
 rename Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/{ => net10.0}/AwaitForeach.gold (100%)
 rename Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/{ => net10.0}/NotSimpleAsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/{ => net10.0}/SimpleAsyncAwait.gold (100%)
 rename Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/{net10.0 => }/AllSolutionsTest.gold (100%)
 rename Procfiler/test_data/gold/windows/ProcfilerEventPipeLoggerTest/{net10.0 => }/DoTest.gold (100%)

diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/TestAsyncAwait.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/TestAsyncAwait.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/TestAsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/TestAsyncDisposable.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/TestAsyncDisposable.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/TestAwaitForeach.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/TestAwaitForeach.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAwaitForeach.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestNotSimpleAsync.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/TestNotSimpleAsync.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestNotSimpleAsync.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/TestSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestSimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/ConsoleApp1.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/ConsoleApp1.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTests/ConsoleApp1.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/ConsoleApp1.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/DynamicAssemblyCreation.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTests/DynamicAssemblyCreation.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/DynamicAssemblyCreation.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/DynamicAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTests/DynamicAssemblyLoading.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/DynamicAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/ExceptionTryCatchFinally.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTests/ExceptionTryCatchFinally.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/ExceptionTryCatchFinally.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/ExceptionTryCatchFinallyWhen.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTests/ExceptionTryCatchFinallyWhen.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/ExceptionTryCatchFinallyWhen.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/FileWriteProject.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/FileWriteProject.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTests/FileWriteProject.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/FileWriteProject.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/FinalizableObject.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/FinalizableObject.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTests/FinalizableObject.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/FinalizableObject.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/IntensiveThreadPoolUse.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTests/IntensiveThreadPoolUse.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/IntensiveThreadPoolUse.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/LOHAllocations.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/LOHAllocations.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTests/LOHAllocations.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/LOHAllocations.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/NotExistingAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTests/NotExistingAssemblyLoading.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/NotExistingAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/SystemArrayPooling.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/SystemArrayPooling.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTests/SystemArrayPooling.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/SystemArrayPooling.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/TaskTestProject1.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/TaskTestProject1.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTests/TaskTestProject1.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/TaskTestProject1.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/UnsafeFixed.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/UnsafeFixed.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTests/UnsafeFixed.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTests/net10.0/UnsafeFixed.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/ConsoleApp1.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/ConsoleApp1.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/ConsoleApp1.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/ConsoleApp1.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/DynamicAssemblyCreation.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/DynamicAssemblyCreation.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/DynamicAssemblyCreation.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/DynamicAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/DynamicAssemblyLoading.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/DynamicAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/ExceptionTryCatchFinally.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/ExceptionTryCatchFinally.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/ExceptionTryCatchFinally.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/ExceptionTryCatchFinallyWhen.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/ExceptionTryCatchFinallyWhen.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/ExceptionTryCatchFinallyWhen.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/FileWriteProject.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/FileWriteProject.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/FileWriteProject.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/FileWriteProject.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/FinalizableObject.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/FinalizableObject.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/FinalizableObject.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/FinalizableObject.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/IntensiveThreadPoolUse.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/IntensiveThreadPoolUse.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/IntensiveThreadPoolUse.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/LOHAllocations.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/LOHAllocations.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/LOHAllocations.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/LOHAllocations.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/NotExistingAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/NotExistingAssemblyLoading.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/NotExistingAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/SystemArrayPooling.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/SystemArrayPooling.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/SystemArrayPooling.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/SystemArrayPooling.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/TaskTestProject1.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/TaskTestProject1.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/TaskTestProject1.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/TaskTestProject1.gold
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/UnsafeFixed.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/UnsafeFixed.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/UnsafeFixed.gold
rename to Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net10.0/UnsafeFixed.gold
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/ConsoleApp1.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/ConsoleApp1.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/ConsoleApp1.gold
rename to Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/ConsoleApp1.gold
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/DynamicAssemblyCreation.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/DynamicAssemblyCreation.gold
rename to Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/DynamicAssemblyCreation.gold
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/DynamicAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/DynamicAssemblyLoading.gold
rename to Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/DynamicAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/ExceptionTryCatchFinally.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/ExceptionTryCatchFinally.gold
rename to Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/ExceptionTryCatchFinally.gold
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/ExceptionTryCatchFinallyWhen.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/ExceptionTryCatchFinallyWhen.gold
rename to Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/ExceptionTryCatchFinallyWhen.gold
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/FileWriteProject.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/FileWriteProject.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/FileWriteProject.gold
rename to Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/FileWriteProject.gold
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/FinalizableObject.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/FinalizableObject.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/FinalizableObject.gold
rename to Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/FinalizableObject.gold
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/IntensiveThreadPoolUse.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/IntensiveThreadPoolUse.gold
rename to Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/IntensiveThreadPoolUse.gold
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/LOHAllocations.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/LOHAllocations.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/LOHAllocations.gold
rename to Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/LOHAllocations.gold
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/NotExistingAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/NotExistingAssemblyLoading.gold
rename to Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/NotExistingAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/SystemArrayPooling.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/SystemArrayPooling.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/SystemArrayPooling.gold
rename to Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/SystemArrayPooling.gold
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/TaskTestProject1.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/TaskTestProject1.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/TaskTestProject1.gold
rename to Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/TaskTestProject1.gold
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/UnsafeFixed.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/UnsafeFixed.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/UnsafeFixed.gold
rename to Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net10.0/UnsafeFixed.gold
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/ConsoleApp1.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/ConsoleApp1.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/MethodsStartEndTests/ConsoleApp1.gold
rename to Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/ConsoleApp1.gold
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/DynamicAssemblyCreation.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/MethodsStartEndTests/DynamicAssemblyCreation.gold
rename to Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/DynamicAssemblyCreation.gold
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/DynamicAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/MethodsStartEndTests/DynamicAssemblyLoading.gold
rename to Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/DynamicAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/ExceptionTryCatchFinally.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/MethodsStartEndTests/ExceptionTryCatchFinally.gold
rename to Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/ExceptionTryCatchFinally.gold
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/ExceptionTryCatchFinallyWhen.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/MethodsStartEndTests/ExceptionTryCatchFinallyWhen.gold
rename to Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/ExceptionTryCatchFinallyWhen.gold
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/FileWriteProject.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/FileWriteProject.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/MethodsStartEndTests/FileWriteProject.gold
rename to Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/FileWriteProject.gold
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/FinalizableObject.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/FinalizableObject.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/MethodsStartEndTests/FinalizableObject.gold
rename to Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/FinalizableObject.gold
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/IntensiveThreadPoolUse.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/MethodsStartEndTests/IntensiveThreadPoolUse.gold
rename to Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/IntensiveThreadPoolUse.gold
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/LOHAllocations.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/LOHAllocations.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/MethodsStartEndTests/LOHAllocations.gold
rename to Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/LOHAllocations.gold
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/NotExistingAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/MethodsStartEndTests/NotExistingAssemblyLoading.gold
rename to Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/NotExistingAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/Sockets.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/Sockets.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/MethodsStartEndTests/Sockets.gold
rename to Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/Sockets.gold
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/SystemArrayPooling.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/SystemArrayPooling.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/MethodsStartEndTests/SystemArrayPooling.gold
rename to Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/SystemArrayPooling.gold
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/TaskTestProject1.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/TaskTestProject1.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/MethodsStartEndTests/TaskTestProject1.gold
rename to Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/TaskTestProject1.gold
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/UnsafeFixed.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/UnsafeFixed.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/MethodsStartEndTests/UnsafeFixed.gold
rename to Procfiler/test_data/gold/linux/MethodsStartEndTests/net10.0/UnsafeFixed.gold
diff --git a/Procfiler/test_data/gold/linux/OcelEventsTest/SimpleTest.gold b/Procfiler/test_data/gold/linux/OcelEventsTest/net10.0/SimpleTest.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/OcelEventsTest/SimpleTest.gold
rename to Procfiler/test_data/gold/linux/OcelEventsTest/net10.0/SimpleTest.gold
diff --git a/Procfiler/test_data/gold/linux/OcelEventsTest/SimpleTest2.gold b/Procfiler/test_data/gold/linux/OcelEventsTest/net10.0/SimpleTest2.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/OcelEventsTest/SimpleTest2.gold
rename to Procfiler/test_data/gold/linux/OcelEventsTest/net10.0/SimpleTest2.gold
diff --git a/Procfiler/test_data/gold/linux/OcelEventsTest/SimpleTest3.gold b/Procfiler/test_data/gold/linux/OcelEventsTest/net10.0/SimpleTest3.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/OcelEventsTest/SimpleTest3.gold
rename to Procfiler/test_data/gold/linux/OcelEventsTest/net10.0/SimpleTest3.gold
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/AsyncAwait.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net10.0/AsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/AsyncAwait.gold
rename to Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net10.0/AsyncAwait.gold
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/AsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net10.0/AsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/AsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net10.0/AsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/AsyncDisposable.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net10.0/AsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/AsyncDisposable.gold
rename to Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net10.0/AsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/AwaitForeach.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net10.0/AwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/AwaitForeach.gold
rename to Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net10.0/AwaitForeach.gold
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/NotSimpleAsyncAwait.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net10.0/NotSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/NotSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net10.0/NotSimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/SimpleAsyncAwait.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net10.0/SimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/SimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net10.0/SimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/TestAsyncAwait.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/TestAsyncAwait.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/TestAsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/TestAsyncDisposable.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/TestAsyncDisposable.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/TestAwaitForeach.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/TestAwaitForeach.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAwaitForeach.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestNotSimpleAsync.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/TestNotSimpleAsync.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestNotSimpleAsync.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/TestSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestSimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/ConsoleApp1.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/ConsoleApp1.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTests/ConsoleApp1.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/ConsoleApp1.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/DynamicAssemblyCreation.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTests/DynamicAssemblyCreation.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/DynamicAssemblyCreation.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/DynamicAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTests/DynamicAssemblyLoading.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/DynamicAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/ExceptionTryCatchFinally.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTests/ExceptionTryCatchFinally.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/ExceptionTryCatchFinally.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/ExceptionTryCatchFinallyWhen.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTests/ExceptionTryCatchFinallyWhen.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/ExceptionTryCatchFinallyWhen.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/FileWriteProject.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/FileWriteProject.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTests/FileWriteProject.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/FileWriteProject.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/FinalizableObject.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/FinalizableObject.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTests/FinalizableObject.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/FinalizableObject.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/IntensiveThreadPoolUse.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTests/IntensiveThreadPoolUse.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/IntensiveThreadPoolUse.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/LOHAllocations.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/LOHAllocations.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTests/LOHAllocations.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/LOHAllocations.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/NotExistingAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTests/NotExistingAssemblyLoading.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/NotExistingAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/SystemArrayPooling.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/SystemArrayPooling.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTests/SystemArrayPooling.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/SystemArrayPooling.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/TaskTestProject1.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/TaskTestProject1.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTests/TaskTestProject1.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/TaskTestProject1.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/UnsafeFixed.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/UnsafeFixed.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTests/UnsafeFixed.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTests/net10.0/UnsafeFixed.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/ConsoleApp1.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/ConsoleApp1.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/ConsoleApp1.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/ConsoleApp1.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/DynamicAssemblyCreation.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/DynamicAssemblyCreation.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/DynamicAssemblyCreation.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/DynamicAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/DynamicAssemblyLoading.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/DynamicAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/ExceptionTryCatchFinally.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/ExceptionTryCatchFinally.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/ExceptionTryCatchFinally.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/ExceptionTryCatchFinallyWhen.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/ExceptionTryCatchFinallyWhen.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/ExceptionTryCatchFinallyWhen.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/FileWriteProject.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/FileWriteProject.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/FileWriteProject.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/FileWriteProject.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/FinalizableObject.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/FinalizableObject.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/FinalizableObject.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/FinalizableObject.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/IntensiveThreadPoolUse.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/IntensiveThreadPoolUse.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/IntensiveThreadPoolUse.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/LOHAllocations.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/LOHAllocations.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/LOHAllocations.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/LOHAllocations.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/NotExistingAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/NotExistingAssemblyLoading.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/NotExistingAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/SystemArrayPooling.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/SystemArrayPooling.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/SystemArrayPooling.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/SystemArrayPooling.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/TaskTestProject1.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/TaskTestProject1.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/TaskTestProject1.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/TaskTestProject1.gold
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/UnsafeFixed.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/UnsafeFixed.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/UnsafeFixed.gold
rename to Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net10.0/UnsafeFixed.gold
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/ConsoleApp1.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/ConsoleApp1.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/ConsoleApp1.gold
rename to Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/ConsoleApp1.gold
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/DynamicAssemblyCreation.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/DynamicAssemblyCreation.gold
rename to Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/DynamicAssemblyCreation.gold
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/DynamicAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/DynamicAssemblyLoading.gold
rename to Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/DynamicAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/ExceptionTryCatchFinally.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/ExceptionTryCatchFinally.gold
rename to Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/ExceptionTryCatchFinally.gold
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/ExceptionTryCatchFinallyWhen.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/ExceptionTryCatchFinallyWhen.gold
rename to Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/ExceptionTryCatchFinallyWhen.gold
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/FileWriteProject.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/FileWriteProject.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/FileWriteProject.gold
rename to Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/FileWriteProject.gold
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/FinalizableObject.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/FinalizableObject.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/FinalizableObject.gold
rename to Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/FinalizableObject.gold
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/IntensiveThreadPoolUse.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/IntensiveThreadPoolUse.gold
rename to Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/IntensiveThreadPoolUse.gold
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/LOHAllocations.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/LOHAllocations.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/LOHAllocations.gold
rename to Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/LOHAllocations.gold
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/NotExistingAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/NotExistingAssemblyLoading.gold
rename to Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/NotExistingAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/SystemArrayPooling.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/SystemArrayPooling.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/SystemArrayPooling.gold
rename to Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/SystemArrayPooling.gold
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/TaskTestProject1.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/TaskTestProject1.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/TaskTestProject1.gold
rename to Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/TaskTestProject1.gold
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/UnsafeFixed.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/UnsafeFixed.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/UnsafeFixed.gold
rename to Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net10.0/UnsafeFixed.gold
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/ConsoleApp1.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/ConsoleApp1.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/MethodsStartEndTests/ConsoleApp1.gold
rename to Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/ConsoleApp1.gold
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/DynamicAssemblyCreation.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/MethodsStartEndTests/DynamicAssemblyCreation.gold
rename to Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/DynamicAssemblyCreation.gold
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/DynamicAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/MethodsStartEndTests/DynamicAssemblyLoading.gold
rename to Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/DynamicAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/ExceptionTryCatchFinally.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/MethodsStartEndTests/ExceptionTryCatchFinally.gold
rename to Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/ExceptionTryCatchFinally.gold
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/ExceptionTryCatchFinallyWhen.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/MethodsStartEndTests/ExceptionTryCatchFinallyWhen.gold
rename to Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/ExceptionTryCatchFinallyWhen.gold
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/FileWriteProject.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/FileWriteProject.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/MethodsStartEndTests/FileWriteProject.gold
rename to Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/FileWriteProject.gold
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/FinalizableObject.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/FinalizableObject.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/MethodsStartEndTests/FinalizableObject.gold
rename to Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/FinalizableObject.gold
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/IntensiveThreadPoolUse.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/MethodsStartEndTests/IntensiveThreadPoolUse.gold
rename to Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/IntensiveThreadPoolUse.gold
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/LOHAllocations.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/LOHAllocations.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/MethodsStartEndTests/LOHAllocations.gold
rename to Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/LOHAllocations.gold
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/NotExistingAssemblyLoading.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/MethodsStartEndTests/NotExistingAssemblyLoading.gold
rename to Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/NotExistingAssemblyLoading.gold
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/Sockets.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/Sockets.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/MethodsStartEndTests/Sockets.gold
rename to Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/Sockets.gold
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/SystemArrayPooling.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/SystemArrayPooling.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/MethodsStartEndTests/SystemArrayPooling.gold
rename to Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/SystemArrayPooling.gold
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/TaskTestProject1.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/TaskTestProject1.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/MethodsStartEndTests/TaskTestProject1.gold
rename to Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/TaskTestProject1.gold
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/UnsafeFixed.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/UnsafeFixed.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/MethodsStartEndTests/UnsafeFixed.gold
rename to Procfiler/test_data/gold/macos/MethodsStartEndTests/net10.0/UnsafeFixed.gold
diff --git a/Procfiler/test_data/gold/macos/OcelEventsTest/SimpleTest.gold b/Procfiler/test_data/gold/macos/OcelEventsTest/net10.0/SimpleTest.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/OcelEventsTest/SimpleTest.gold
rename to Procfiler/test_data/gold/macos/OcelEventsTest/net10.0/SimpleTest.gold
diff --git a/Procfiler/test_data/gold/macos/OcelEventsTest/SimpleTest2.gold b/Procfiler/test_data/gold/macos/OcelEventsTest/net10.0/SimpleTest2.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/OcelEventsTest/SimpleTest2.gold
rename to Procfiler/test_data/gold/macos/OcelEventsTest/net10.0/SimpleTest2.gold
diff --git a/Procfiler/test_data/gold/macos/OcelEventsTest/SimpleTest3.gold b/Procfiler/test_data/gold/macos/OcelEventsTest/net10.0/SimpleTest3.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/OcelEventsTest/SimpleTest3.gold
rename to Procfiler/test_data/gold/macos/OcelEventsTest/net10.0/SimpleTest3.gold
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/AsyncAwait.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net10.0/AsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/AsyncAwait.gold
rename to Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net10.0/AsyncAwait.gold
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/AsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net10.0/AsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/AsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net10.0/AsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/AsyncDisposable.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net10.0/AsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/AsyncDisposable.gold
rename to Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net10.0/AsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/AwaitForeach.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net10.0/AwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/AwaitForeach.gold
rename to Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net10.0/AwaitForeach.gold
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/NotSimpleAsyncAwait.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net10.0/NotSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/NotSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net10.0/NotSimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/SimpleAsyncAwait.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net10.0/SimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/SimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net10.0/SimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/net10.0/AllSolutionsTest.gold b/Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/AllSolutionsTest.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/net10.0/AllSolutionsTest.gold
rename to Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/AllSolutionsTest.gold
diff --git a/Procfiler/test_data/gold/windows/ProcfilerEventPipeLoggerTest/net10.0/DoTest.gold b/Procfiler/test_data/gold/windows/ProcfilerEventPipeLoggerTest/DoTest.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/ProcfilerEventPipeLoggerTest/net10.0/DoTest.gold
rename to Procfiler/test_data/gold/windows/ProcfilerEventPipeLoggerTest/DoTest.gold

From 37b000df1d26e5779325e4caddfc37a5e3913418 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sat, 2 May 2026 12:44:51 +0300
Subject: [PATCH 13/53] Execute tests with different tfms

---
 Procfiler/src/dotnet/TestsUtil/KnownSolution.cs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Procfiler/src/dotnet/TestsUtil/KnownSolution.cs b/Procfiler/src/dotnet/TestsUtil/KnownSolution.cs
index f097bdb27..9c1cec0fc 100644
--- a/Procfiler/src/dotnet/TestsUtil/KnownSolution.cs
+++ b/Procfiler/src/dotnet/TestsUtil/KnownSolution.cs
@@ -1,8 +1,12 @@
 namespace TestsUtil;
 
-public class KnownSolution
+public record KnownSolution
 {
-  private const string TargetFramework = "net10.0";
+  private const string Net8 = "net8.0";
+  private const string Net9 = "net9.0";
+  private const string Net10 = "net10.0";
+
+  private const string TargetFramework = Net10;
 
   public static KnownSolution ConsoleApp1 { get; } = new("ConsoleApp1");
   public static KnownSolution TaskTestProject1 { get; } = new("TaskTestProject1");
@@ -31,7 +35,7 @@ public class KnownSolution
   public static KnownSolution OcelWithIfs { get; } = new("OcelWithIfs");
 
 
-  public static IEnumerable<KnownSolution> AllSolutions { get; } =
+  private static KnownSolution[] ourSolutions =
   [
     ConsoleApp1,
     TaskTestProject1,
@@ -53,8 +57,12 @@ public class KnownSolution
     LohAllocations
   ];
 
+
+  public static IEnumerable<KnownSolution> AllSolutions { get; } =
+    ourSolutions.Concat(ourSolutions.Select(s => s with { Tfm = Net9 }).Concat(ourSolutions.Select(s => s with { Tfm = Net8 })));
+
   public string Name { get; }
-  public string Tfm { get; }
+  public string Tfm { get; private init; }
   public int ExpectedEventsCount { get; }
   public string NamespaceFilterPattern { get; }
 

From bafc1ff1742e06d458ed111f2101bd3f87ee0cd7 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sat, 2 May 2026 14:32:51 +0300
Subject: [PATCH 14/53] Lower ICorProfilerInfo version

---
 .../offline/corprofiler/ProcfilerCorProfilerCallback.cpp  | 4 ++--
 .../offline/corprofiler/ProcfilerCorProfilerCallback.h    | 4 ++--
 .../cpp/offline/corprofiler/objects/ObjectsManager.cpp    | 2 +-
 .../src/cpp/offline/corprofiler/objects/ObjectsManager.h  | 4 ++--
 .../cpp/offline/corprofiler/shadowstack/ShadowStack.cpp   | 2 +-
 .../src/cpp/offline/corprofiler/shadowstack/ShadowStack.h | 4 ++--
 .../serializers/BinaryShadowStackSerializer.cpp           | 2 +-
 .../shadowstack/serializers/BinaryShadowStackSerializer.h | 4 ++--
 .../serializers/DebugShadowStackSerializer.cpp            | 2 +-
 .../shadowstack/serializers/DebugShadowStackSerializer.h  | 4 ++--
 .../serializers/EventPipeShadowStackSerializer.cpp        | 4 ++--
 .../serializers/EventPipeShadowStackSerializer.h          | 6 +++---
 .../online/corprofiler/ProcfilerCorProfilerCallback.cpp   | 6 +++---
 .../cpp/online/corprofiler/ProcfilerCorProfilerCallback.h | 4 ++--
 .../cpp/online/corprofiler/eventpipe/EventPipeWriter.cpp  | 4 ++--
 .../cpp/online/corprofiler/eventpipe/EventPipeWriter.h    | 6 +++---
 Procfiler/src/cpp/shared/info/AssemblyInfo.cpp            | 2 +-
 Procfiler/src/cpp/shared/info/AssemblyInfo.h              | 2 +-
 Procfiler/src/cpp/shared/info/FunctionInfo.cpp            | 2 +-
 Procfiler/src/cpp/shared/info/FunctionInfo.h              | 2 +-
 Procfiler/src/cpp/shared/info/ModuleInfo.cpp              | 2 +-
 Procfiler/src/cpp/shared/info/ModuleInfo.h                | 2 +-
 Procfiler/src/cpp/shared/info/clr/profiler.hpp            | 8 ++++----
 23 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/Procfiler/src/cpp/offline/corprofiler/ProcfilerCorProfilerCallback.cpp b/Procfiler/src/cpp/offline/corprofiler/ProcfilerCorProfilerCallback.cpp
index 6a847a940..8f2d00c75 100644
--- a/Procfiler/src/cpp/offline/corprofiler/ProcfilerCorProfilerCallback.cpp
+++ b/Procfiler/src/cpp/offline/corprofiler/ProcfilerCorProfilerCallback.cpp
@@ -80,7 +80,7 @@ void ProcfilerCorProfilerCallback::HandleFunctionTailCall2(const FunctionID func
     HandleFunctionTailCall(funcId);
 }
 
-ICorProfilerInfo15* ProcfilerCorProfilerCallback::GetProfilerInfo() const {
+ICorProfilerInfo12* ProcfilerCorProfilerCallback::GetProfilerInfo() const {
     return myProfilerInfo;
 }
 
@@ -88,7 +88,7 @@ HRESULT ProcfilerCorProfilerCallback::Initialize(IUnknown* pICorProfilerInfoUnk)
     myLogger->LogInformation("Started initializing CorProfiler callback");
     const auto ptr = reinterpret_cast<void**>(&this->myProfilerInfo);
 
-    HRESULT result = pICorProfilerInfoUnk->QueryInterface(IID_ICorProfilerInfo15, ptr);
+    HRESULT result = pICorProfilerInfoUnk->QueryInterface(IID_ICorProfilerInfo12, ptr);
     if (FAILED(result)) {
         myLogger->LogInformation("Failed to query interface: " + std::to_string(result));
         return E_FAIL;
diff --git a/Procfiler/src/cpp/offline/corprofiler/ProcfilerCorProfilerCallback.h b/Procfiler/src/cpp/offline/corprofiler/ProcfilerCorProfilerCallback.h
index 8e4a97787..f8ae9517b 100644
--- a/Procfiler/src/cpp/offline/corprofiler/ProcfilerCorProfilerCallback.h
+++ b/Procfiler/src/cpp/offline/corprofiler/ProcfilerCorProfilerCallback.h
@@ -10,7 +10,7 @@
 
 class ProcfilerCorProfilerCallback final : public ICorProfilerCallback11 {
     ProcfilerLogger* myLogger;
-    ICorProfilerInfo15* myProfilerInfo;
+    ICorProfilerInfo12* myProfilerInfo;
     std::atomic<int> myRefCount;
     ShadowStack* myShadowStack;
     ShadowStackSerializer* myShadowStackSerializer;
@@ -23,7 +23,7 @@ class ProcfilerCorProfilerCallback final : public ICorProfilerCallback11 {
     explicit ProcfilerCorProfilerCallback(ProcfilerLogger* logger);
     ~ProcfilerCorProfilerCallback();
 
-    ICorProfilerInfo15* GetProfilerInfo() const;
+    ICorProfilerInfo12* GetProfilerInfo() const;
 
     void HandleFunctionEnter(FunctionID funcId) const;
     void HandleFunctionLeave(FunctionID funcId) const;
diff --git a/Procfiler/src/cpp/offline/corprofiler/objects/ObjectsManager.cpp b/Procfiler/src/cpp/offline/corprofiler/objects/ObjectsManager.cpp
index 5485e16bd..658675fab 100644
--- a/Procfiler/src/cpp/offline/corprofiler/objects/ObjectsManager.cpp
+++ b/Procfiler/src/cpp/offline/corprofiler/objects/ObjectsManager.cpp
@@ -8,7 +8,7 @@
 
 #include "MetadataCookie.hpp"
 
-ObjectsManager::ObjectsManager(ICorProfilerInfo15* info) {
+ObjectsManager::ObjectsManager(ICorProfilerInfo12* info) {
     myProfilerInfo = info;
 }
 
diff --git a/Procfiler/src/cpp/offline/corprofiler/objects/ObjectsManager.h b/Procfiler/src/cpp/offline/corprofiler/objects/ObjectsManager.h
index 95794ac2d..6d8f210cf 100644
--- a/Procfiler/src/cpp/offline/corprofiler/objects/ObjectsManager.h
+++ b/Procfiler/src/cpp/offline/corprofiler/objects/ObjectsManager.h
@@ -8,12 +8,12 @@
 #include "corprof.h"
 
 class ObjectsManager {
-    ICorProfilerInfo15* myProfilerInfo;
+    ICorProfilerInfo12* myProfilerInfo;
     std::map<ObjectID, UINT64> myObjectsIds;
     std::mutex myMutex;
 
 public:
-    explicit ObjectsManager(ICorProfilerInfo15* info);
+    explicit ObjectsManager(ICorProfilerInfo12* info);
 
     ~ObjectsManager();
 
diff --git a/Procfiler/src/cpp/offline/corprofiler/shadowstack/ShadowStack.cpp b/Procfiler/src/cpp/offline/corprofiler/shadowstack/ShadowStack.cpp
index c43cc169a..2ee6da76a 100644
--- a/Procfiler/src/cpp/offline/corprofiler/shadowstack/ShadowStack.cpp
+++ b/Procfiler/src/cpp/offline/corprofiler/shadowstack/ShadowStack.cpp
@@ -9,7 +9,7 @@ static thread_local EventsWithThreadId* ourEvents;
 static std::map<ThreadID, EventsWithThreadId*> ourEventsPerThreads;
 static std::mutex ourEventsPerThreadMutex;
 
-ShadowStack::ShadowStack(ICorProfilerInfo15* profilerInfo, ProcfilerLogger* logger, bool onlineSerialization) {
+ShadowStack::ShadowStack(ICorProfilerInfo12* profilerInfo, ProcfilerLogger* logger, bool onlineSerialization) {
     myProfilerInfo = profilerInfo;
     myOnlineSerialization = onlineSerialization;
 
diff --git a/Procfiler/src/cpp/offline/corprofiler/shadowstack/ShadowStack.h b/Procfiler/src/cpp/offline/corprofiler/shadowstack/ShadowStack.h
index 4ade38165..4c7502cda 100644
--- a/Procfiler/src/cpp/offline/corprofiler/shadowstack/ShadowStack.h
+++ b/Procfiler/src/cpp/offline/corprofiler/shadowstack/ShadowStack.h
@@ -30,7 +30,7 @@ class ShadowStack {
     std::regex* myFilterRegex{nullptr};
 
     bool myOnlineSerialization{false};
-    ICorProfilerInfo15* myProfilerInfo;
+    ICorProfilerInfo12* myProfilerInfo;
     ProcfilerLogger* myLogger;
     std::atomic<int> myCurrentAddition{0};
     std::atomic<bool> myCanProcessFunctionEvents{true};
@@ -38,7 +38,7 @@ class ShadowStack {
     bool CanProcessFunctionEvents();
     bool ShouldAddFunc(FunctionID& id, DWORD threadId) const;
 public:
-    explicit ShadowStack(ICorProfilerInfo15* profilerInfo, ProcfilerLogger* logger, bool onlineSerialization);
+    explicit ShadowStack(ICorProfilerInfo12* profilerInfo, ProcfilerLogger* logger, bool onlineSerialization);
 
     ~ShadowStack();
     void AddFunctionEnter(FunctionID id, DWORD threadId, int64_t timestamp);
diff --git a/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/BinaryShadowStackSerializer.cpp b/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/BinaryShadowStackSerializer.cpp
index e7be9e483..0b258aff8 100644
--- a/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/BinaryShadowStackSerializer.cpp
+++ b/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/BinaryShadowStackSerializer.cpp
@@ -4,7 +4,7 @@
 #include <regex>
 #include <set>
 
-BinaryShadowStackSerializer::BinaryShadowStackSerializer(ICorProfilerInfo15* profilerInfo,
+BinaryShadowStackSerializer::BinaryShadowStackSerializer(ICorProfilerInfo12* profilerInfo,
                                                          ProcfilerLogger* logger) {
     myProfilerInfo = profilerInfo;
     myLogger = logger;
diff --git a/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/BinaryShadowStackSerializer.h b/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/BinaryShadowStackSerializer.h
index 8633967ee..aaa55c575 100644
--- a/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/BinaryShadowStackSerializer.h
+++ b/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/BinaryShadowStackSerializer.h
@@ -7,7 +7,7 @@
 
 class BinaryShadowStackSerializer : public ShadowStackSerializer {
     std::string mySavePath;
-    ICorProfilerInfo15* myProfilerInfo;
+    ICorProfilerInfo12* myProfilerInfo;
     ProcfilerLogger* myLogger;
     bool myUseSeparateBinstacksFiles{false};
 
@@ -22,7 +22,7 @@ class BinaryShadowStackSerializer : public ShadowStackSerializer {
 
     std::regex* TryCreateMethodsFilterRegex() const;
 public:
-    explicit BinaryShadowStackSerializer(ICorProfilerInfo15* profilerInfo, ProcfilerLogger* logger);
+    explicit BinaryShadowStackSerializer(ICorProfilerInfo12* profilerInfo, ProcfilerLogger* logger);
     ~BinaryShadowStackSerializer() override = default;
 
     void Init() override;
diff --git a/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/DebugShadowStackSerializer.cpp b/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/DebugShadowStackSerializer.cpp
index b688fb07d..0a96de431 100644
--- a/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/DebugShadowStackSerializer.cpp
+++ b/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/DebugShadowStackSerializer.cpp
@@ -2,7 +2,7 @@
 #include "DebugShadowStackSerializer.h"
 #include <env_constants.h>
 
-DebugShadowStackSerializer::DebugShadowStackSerializer(ICorProfilerInfo15* profilerInfo, ProcfilerLogger* logger) {
+DebugShadowStackSerializer::DebugShadowStackSerializer(ICorProfilerInfo12* profilerInfo, ProcfilerLogger* logger) {
     myProfilerInfo = profilerInfo;
     myLogger = logger;
 }
diff --git a/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/DebugShadowStackSerializer.h b/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/DebugShadowStackSerializer.h
index ed0dd7743..291c9b453 100644
--- a/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/DebugShadowStackSerializer.h
+++ b/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/DebugShadowStackSerializer.h
@@ -5,11 +5,11 @@
 
 class DebugShadowStackSerializer : public ShadowStackSerializer {
     std::string mySavePath;
-    ICorProfilerInfo15* myProfilerInfo;
+    ICorProfilerInfo12* myProfilerInfo;
     ProcfilerLogger* myLogger;
 
 public:
-    explicit DebugShadowStackSerializer(ICorProfilerInfo15* profilerInfo, ProcfilerLogger* logger);
+    explicit DebugShadowStackSerializer(ICorProfilerInfo12* profilerInfo, ProcfilerLogger* logger);
     ~DebugShadowStackSerializer() override = default;
 
     void Init() override;
diff --git a/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/EventPipeShadowStackSerializer.cpp b/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/EventPipeShadowStackSerializer.cpp
index 6c25ba1e6..4e8da331c 100644
--- a/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/EventPipeShadowStackSerializer.cpp
+++ b/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/EventPipeShadowStackSerializer.cpp
@@ -1,6 +1,6 @@
 #include "EventPipeShadowStackSerializer.h"
 
-EventPipeShadowStackSerializer::EventPipeShadowStackSerializer(ICorProfilerInfo15* profilerInfo,
+EventPipeShadowStackSerializer::EventPipeShadowStackSerializer(ICorProfilerInfo12* profilerInfo,
                                                                ProcfilerLogger* logger) {
     myLogger = logger;
     myProfilerInfo = profilerInfo;
@@ -88,7 +88,7 @@ HRESULT EventPipeShadowStackSerializer::DefineProcfilerEventPipeProvider() {
 HRESULT EventPipeShadowStackSerializer::DefineMethodStartOrEndEventInternal(const wstring& eventName,
                                                                             EVENTPIPE_PROVIDER provider,
                                                                             EVENTPIPE_EVENT* outEventId,
-                                                                            ICorProfilerInfo15* profilerInfo,
+                                                                            ICorProfilerInfo12* profilerInfo,
                                                                             UINT32 eventId) {
     COR_PRF_EVENTPIPE_PARAM_DESC eventParameters[] = {
             {COR_PRF_EVENTPIPE_UINT64, 0, ToWString("Timestamp").c_str()},
diff --git a/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/EventPipeShadowStackSerializer.h b/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/EventPipeShadowStackSerializer.h
index dec3b6c53..7819e2a27 100644
--- a/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/EventPipeShadowStackSerializer.h
+++ b/Procfiler/src/cpp/offline/corprofiler/shadowstack/serializers/EventPipeShadowStackSerializer.h
@@ -13,7 +13,7 @@ class EventPipeShadowStackSerializer : public ShadowStackSerializer {
     const wstring ourMethodInfoEventName = ToWString("ProcfilerMethodInfo");
     const wstring ourEventPipeProviderName = ToWString("ProcfilerCppEventPipeProvider");
 
-    ICorProfilerInfo15* myProfilerInfo;
+    ICorProfilerInfo12* myProfilerInfo;
     ProcfilerLogger* myLogger;
 
     EVENTPIPE_PROVIDER myEventPipeProvider{};
@@ -38,11 +38,11 @@ class EventPipeShadowStackSerializer : public ShadowStackSerializer {
     static HRESULT DefineMethodStartOrEndEventInternal(const wstring& eventName,
                                                        EVENTPIPE_PROVIDER provider,
                                                        EVENTPIPE_EVENT* ourEventId,
-                                                       ICorProfilerInfo15* profilerInfo,
+                                                       ICorProfilerInfo12* profilerInfo,
                                                        UINT32 eventId);
 
 public:
-    explicit EventPipeShadowStackSerializer(ICorProfilerInfo15* profilerInfo, ProcfilerLogger* logger);
+    explicit EventPipeShadowStackSerializer(ICorProfilerInfo12* profilerInfo, ProcfilerLogger* logger);
     ~EventPipeShadowStackSerializer() override = default;
 
     void Init() override;
diff --git a/Procfiler/src/cpp/online/corprofiler/ProcfilerCorProfilerCallback.cpp b/Procfiler/src/cpp/online/corprofiler/ProcfilerCorProfilerCallback.cpp
index 76b915567..cfd21452b 100644
--- a/Procfiler/src/cpp/online/corprofiler/ProcfilerCorProfilerCallback.cpp
+++ b/Procfiler/src/cpp/online/corprofiler/ProcfilerCorProfilerCallback.cpp
@@ -40,16 +40,16 @@ void ProcfilerCorProfilerCallback::HandleFunctionTailCall(const FunctionID funcI
     myWriter->LogFunctionEvent(FunctionEvent(funcId, Finished, GetCurrentTimestamp()));
 }
 
-ICorProfilerInfo15 *ProcfilerCorProfilerCallback::GetProfilerInfo() const {
+ICorProfilerInfo12 *ProcfilerCorProfilerCallback::GetProfilerInfo() const {
     return myProfilerInfo;
 }
 
 HRESULT ProcfilerCorProfilerCallback::Initialize(IUnknown *pICorProfilerInfoUnk) {
     const auto ptr = reinterpret_cast<void **>(&this->myProfilerInfo);
 
-    HRESULT result = pICorProfilerInfoUnk->QueryInterface(IID_ICorProfilerInfo15, ptr);
+    HRESULT result = pICorProfilerInfoUnk->QueryInterface(IID_ICorProfilerInfo12, ptr);
     if (FAILED(result)) {
-        myLogger->LogError("Failed to get IID_ICorProfilerInfo15 interface");
+        myLogger->LogError("Failed to get IID_ICorProfilerInfo12 interface");
         return E_FAIL;
     }
 
diff --git a/Procfiler/src/cpp/online/corprofiler/ProcfilerCorProfilerCallback.h b/Procfiler/src/cpp/online/corprofiler/ProcfilerCorProfilerCallback.h
index bcdd0ca81..12dc41bbd 100644
--- a/Procfiler/src/cpp/online/corprofiler/ProcfilerCorProfilerCallback.h
+++ b/Procfiler/src/cpp/online/corprofiler/ProcfilerCorProfilerCallback.h
@@ -9,7 +9,7 @@
 class ProcfilerCorProfilerCallback final : public ICorProfilerCallback11 {
 private:
     ProcfilerLogger* myLogger;
-    ICorProfilerInfo15* myProfilerInfo;
+    ICorProfilerInfo12* myProfilerInfo;
     std::atomic<int> myRefCount;
     EventPipeWriter* myWriter;
 
@@ -19,7 +19,7 @@ class ProcfilerCorProfilerCallback final : public ICorProfilerCallback11 {
     explicit ProcfilerCorProfilerCallback();
     ~ProcfilerCorProfilerCallback();
 
-    ICorProfilerInfo15* GetProfilerInfo() const;
+    ICorProfilerInfo12* GetProfilerInfo() const;
 
     void HandleFunctionEnter2(FunctionID funcId) const;
     void HandleFunctionLeave2(FunctionID funcId) const;
diff --git a/Procfiler/src/cpp/online/corprofiler/eventpipe/EventPipeWriter.cpp b/Procfiler/src/cpp/online/corprofiler/eventpipe/EventPipeWriter.cpp
index 37b6f4cdd..945e53ac7 100644
--- a/Procfiler/src/cpp/online/corprofiler/eventpipe/EventPipeWriter.cpp
+++ b/Procfiler/src/cpp/online/corprofiler/eventpipe/EventPipeWriter.cpp
@@ -9,7 +9,7 @@
 
 #include "FunctionEvent.h"
 
-EventPipeWriter::EventPipeWriter(ICorProfilerInfo15 *profilerInfo) {
+EventPipeWriter::EventPipeWriter(ICorProfilerInfo12 *profilerInfo) {
     myLogger = new ProcfilerLogger();
     myProfilerInfo = profilerInfo;
 }
@@ -102,7 +102,7 @@ HRESULT EventPipeWriter::DefineProcfilerEventPipeProvider() {
 HRESULT EventPipeWriter::DefineMethodStartOrEndEventInternal(const wstring &eventName,
                                                              const EVENTPIPE_PROVIDER provider,
                                                              EVENTPIPE_EVENT *eventPipeEventId,
-                                                             ICorProfilerInfo15 *profilerInfo,
+                                                             ICorProfilerInfo12 *profilerInfo,
                                                              const UINT32 eventId) const {
     COR_PRF_EVENTPIPE_PARAM_DESC eventParameters[] = {
         {COR_PRF_EVENTPIPE_INT64, 0, ourTimestampMetadataKey.c_str()},
diff --git a/Procfiler/src/cpp/online/corprofiler/eventpipe/EventPipeWriter.h b/Procfiler/src/cpp/online/corprofiler/eventpipe/EventPipeWriter.h
index 6d81936d5..8661ad218 100644
--- a/Procfiler/src/cpp/online/corprofiler/eventpipe/EventPipeWriter.h
+++ b/Procfiler/src/cpp/online/corprofiler/eventpipe/EventPipeWriter.h
@@ -45,7 +45,7 @@ class EventPipeWriter {
     std::regex* myMethodsFilterRegex{nullptr};
 
     ProcfilerLogger* myLogger;
-    ICorProfilerInfo15 *myProfilerInfo;
+    ICorProfilerInfo12 *myProfilerInfo;
 
     EVENTPIPE_PROVIDER myEventPipeProvider{};
     EVENTPIPE_EVENT myMethodStartEvent{};
@@ -68,14 +68,14 @@ class EventPipeWriter {
     HRESULT DefineMethodStartOrEndEventInternal(const wstring& eventName,
                                                 EVENTPIPE_PROVIDER provider,
                                                 EVENTPIPE_EVENT *ourEventId,
-                                                ICorProfilerInfo15 *profilerInfo,
+                                                ICorProfilerInfo12 *profilerInfo,
                                                 UINT32 eventId) const;
 
     void InitMethodsFilterRegex();
     bool ShouldLogFunc(FunctionID functionId) const;
 
 public:
-    explicit EventPipeWriter(ICorProfilerInfo15 *profilerInfo);
+    explicit EventPipeWriter(ICorProfilerInfo12 *profilerInfo);
 
     ~EventPipeWriter() = default;
 
diff --git a/Procfiler/src/cpp/shared/info/AssemblyInfo.cpp b/Procfiler/src/cpp/shared/info/AssemblyInfo.cpp
index a5b758483..2418f47e7 100644
--- a/Procfiler/src/cpp/shared/info/AssemblyInfo.cpp
+++ b/Procfiler/src/cpp/shared/info/AssemblyInfo.cpp
@@ -2,7 +2,7 @@
 #include "../util/const.h"
 
 
-AssemblyInfo AssemblyInfo::GetAssemblyInfo(ICorProfilerInfo15* info, AssemblyID assemblyId) {
+AssemblyInfo AssemblyInfo::GetAssemblyInfo(ICorProfilerInfo12* info, AssemblyID assemblyId) {
     std::vector<WCHAR> assemblyName(MAX_CLASS_NAME, (WCHAR)0);
     DWORD assemblyNameLength = 0;
     AppDomainID appDomainId;
diff --git a/Procfiler/src/cpp/shared/info/AssemblyInfo.h b/Procfiler/src/cpp/shared/info/AssemblyInfo.h
index 813e1d54e..0e44b0222 100644
--- a/Procfiler/src/cpp/shared/info/AssemblyInfo.h
+++ b/Procfiler/src/cpp/shared/info/AssemblyInfo.h
@@ -25,7 +25,7 @@ struct AssemblyInfo {
           myAppDomainId(appDomainId),
           myAppDomainName(std::move(appDomainName)) {}
 
-    static AssemblyInfo GetAssemblyInfo(ICorProfilerInfo15* info, AssemblyID assemblyId);
+    static AssemblyInfo GetAssemblyInfo(ICorProfilerInfo12* info, AssemblyID assemblyId);
 
     AssemblyID GetAssemblyId() const;
     wstring GetName();
diff --git a/Procfiler/src/cpp/shared/info/FunctionInfo.cpp b/Procfiler/src/cpp/shared/info/FunctionInfo.cpp
index f234db742..579d79e24 100644
--- a/Procfiler/src/cpp/shared/info/FunctionInfo.cpp
+++ b/Procfiler/src/cpp/shared/info/FunctionInfo.cpp
@@ -3,7 +3,7 @@
 #include <vector>
 
 
-FunctionInfo FunctionInfo::GetFunctionInfo(ICorProfilerInfo15* info, const FunctionID funcId) {
+FunctionInfo FunctionInfo::GetFunctionInfo(ICorProfilerInfo12* info, const FunctionID funcId) {
     mdToken functionToken;
     ClassID classId;
     ModuleID moduleId;
diff --git a/Procfiler/src/cpp/shared/info/FunctionInfo.h b/Procfiler/src/cpp/shared/info/FunctionInfo.h
index de72e282b..bf6ed080e 100644
--- a/Procfiler/src/cpp/shared/info/FunctionInfo.h
+++ b/Procfiler/src/cpp/shared/info/FunctionInfo.h
@@ -48,7 +48,7 @@ struct FunctionInfo {
 
 
     static FunctionInfo GetFunctionInfo(IMetaDataImport2* metadataImport, mdToken token);
-    static FunctionInfo GetFunctionInfo(ICorProfilerInfo15* info, FunctionID funcId);
+    static FunctionInfo GetFunctionInfo(ICorProfilerInfo12* info, FunctionID funcId);
 
     std::string GetFullName();
     mdToken GetId() const;
diff --git a/Procfiler/src/cpp/shared/info/ModuleInfo.cpp b/Procfiler/src/cpp/shared/info/ModuleInfo.cpp
index 0d7973ac2..74f9dabe4 100644
--- a/Procfiler/src/cpp/shared/info/ModuleInfo.cpp
+++ b/Procfiler/src/cpp/shared/info/ModuleInfo.cpp
@@ -2,7 +2,7 @@
 #include "AssemblyInfo.h"
 
 
-ModuleInfo ModuleInfo::GetModuleInfo(ICorProfilerInfo15* info, ModuleID moduleId) {
+ModuleInfo ModuleInfo::GetModuleInfo(ICorProfilerInfo12* info, ModuleID moduleId) {
     std::vector<WCHAR> modulePath(MAX_CLASS_NAME, (WCHAR) 0);
     DWORD length = 0;
     LPCBYTE baseLoadAddress;
diff --git a/Procfiler/src/cpp/shared/info/ModuleInfo.h b/Procfiler/src/cpp/shared/info/ModuleInfo.h
index 16ef80512..45ceb4976 100644
--- a/Procfiler/src/cpp/shared/info/ModuleInfo.h
+++ b/Procfiler/src/cpp/shared/info/ModuleInfo.h
@@ -20,7 +20,7 @@ struct ModuleInfo {
         : myId(id), myPath(std::move(path)), myAssembly(std::move(assembly)), myFlags(flags) {}
 
 
-    static ModuleInfo GetModuleInfo(ICorProfilerInfo15* info, ModuleID moduleId);
+    static ModuleInfo GetModuleInfo(ICorProfilerInfo12* info, ModuleID moduleId);
 
     ModuleID GetId() const;
     wstring GetPath();
diff --git a/Procfiler/src/cpp/shared/info/clr/profiler.hpp b/Procfiler/src/cpp/shared/info/clr/profiler.hpp
index a23862be9..a7509127c 100644
--- a/Procfiler/src/cpp/shared/info/clr/profiler.hpp
+++ b/Procfiler/src/cpp/shared/info/clr/profiler.hpp
@@ -10,7 +10,7 @@
 #define LONG_LENGTH   1024
 
 // copy-paste from https://github.com/dotnet/runtime/tree/main/src/tests/profiler/native
-inline String GetClassIdName(const ClassID classId, ICorProfilerInfo15 *info) {
+inline String GetClassIdName(const ClassID classId, ICorProfilerInfo12 *info) {
     if (classId == NULL) {
         return WCHAR("");
     }
@@ -118,7 +118,7 @@ inline String GetClassIdName(const ClassID classId, ICorProfilerInfo15 *info) {
     return name;
 }
 
-inline String GetFunctionIdName(const FunctionID funcId, ICorProfilerInfo15 *info) {
+inline String GetFunctionIdName(const FunctionID funcId, ICorProfilerInfo12 *info) {
     // If the FunctionID is 0, we could be dealing with a native function.
     if (funcId == 0) {
         return WCHAR("");
@@ -182,7 +182,7 @@ inline String GetFunctionIdName(const FunctionID funcId, ICorProfilerInfo15 *inf
     return name;
 }
 
-inline String GetModuleIDName(const ModuleID modId, ICorProfilerInfo15 *info) {
+inline String GetModuleIDName(const ModuleID modId, ICorProfilerInfo12 *info) {
     WCHAR moduleName[STR_LENGTH];
     ULONG nameLength = 0;
     AssemblyID assemID;
@@ -199,7 +199,7 @@ inline String GetModuleIDName(const ModuleID modId, ICorProfilerInfo15 *info) {
     return moduleName;
 }
 
-inline wstring GetFullFunctionName(const FunctionID functionId, ICorProfilerInfo15* info) {
+inline wstring GetFullFunctionName(const FunctionID functionId, ICorProfilerInfo12* info) {
     mdToken functionToken;
     ClassID classId;
     ModuleID moduleId;

From 5c702a991a895a3fa7a38f548f16e4eadb9f2d3f Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sat, 2 May 2026 14:35:08 +0300
Subject: [PATCH 15/53] Add per-tfm gold

---
 .../net8.0/TestAsyncAwait.gold                | 236 ++++++++
 .../net8.0/TestAsyncAwaitTaskFactoryNew.gold  |  30 ++
 .../net8.0/TestAsyncDisposable.gold           |  68 +++
 .../net8.0/TestAwaitForeach.gold              | 286 ++++++++++
 .../net8.0/TestNotSimpleAsync.gold            | 280 ++++++++++
 .../net8.0/TestSimpleAsyncAwait.gold          |  36 ++
 .../net9.0/TestAsyncAwait.gold                | 236 ++++++++
 .../net9.0/TestAsyncAwaitTaskFactoryNew.gold  |  30 ++
 .../net9.0/TestAsyncDisposable.gold           |  68 +++
 .../net9.0/TestAwaitForeach.gold              | 286 ++++++++++
 .../net9.0/TestNotSimpleAsync.gold            | 280 ++++++++++
 .../net9.0/TestSimpleAsyncAwait.gold          |  36 ++
 .../net8.0/ConsoleApp1.gold                   |  41 ++
 .../net8.0/DynamicAssemblyCreation.gold       |   6 +
 .../net8.0/DynamicAssemblyLoading.gold        |   6 +
 .../net8.0/ExceptionTryCatchFinally.gold      |  22 +
 .../net8.0/ExceptionTryCatchFinallyWhen.gold  |  14 +
 .../net8.0/FileWriteProject.gold              |  34 ++
 .../net8.0/FinalizableObject.gold             | 259 +++++++++
 .../net8.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net8.0/LOHAllocations.gold                |   6 +
 .../net8.0/NotExistingAssemblyLoading.gold    |  40 ++
 .../net8.0/SystemArrayPooling.gold            |   6 +
 .../net8.0/TaskTestProject1.gold              |  14 +
 .../net8.0/UnsafeFixed.gold                   |   6 +
 .../net9.0/ConsoleApp1.gold                   |  41 ++
 .../net9.0/DynamicAssemblyCreation.gold       |   6 +
 .../net9.0/DynamicAssemblyLoading.gold        |   6 +
 .../net9.0/ExceptionTryCatchFinally.gold      |  22 +
 .../net9.0/ExceptionTryCatchFinallyWhen.gold  |  14 +
 .../net9.0/FileWriteProject.gold              |  34 ++
 .../net9.0/FinalizableObject.gold             | 259 +++++++++
 .../net9.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net9.0/LOHAllocations.gold                |   6 +
 .../net9.0/NotExistingAssemblyLoading.gold    |  40 ++
 .../net9.0/SystemArrayPooling.gold            |   6 +
 .../net9.0/TaskTestProject1.gold              |  14 +
 .../net9.0/UnsafeFixed.gold                   |   6 +
 .../net8.0/ConsoleApp1.gold                   |  31 ++
 .../net8.0/DynamicAssemblyCreation.gold       |   6 +
 .../net8.0/DynamicAssemblyLoading.gold        |   6 +
 .../net8.0/ExceptionTryCatchFinally.gold      |  20 +
 .../net8.0/ExceptionTryCatchFinallyWhen.gold  |  13 +
 .../net8.0/FileWriteProject.gold              |  26 +
 .../net8.0/FinalizableObject.gold             | 209 ++++++++
 .../net8.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net8.0/LOHAllocations.gold                |   6 +
 .../net8.0/NotExistingAssemblyLoading.gold    |  31 ++
 .../net8.0/SystemArrayPooling.gold            |   6 +
 .../net8.0/TaskTestProject1.gold              |  13 +
 .../net8.0/UnsafeFixed.gold                   |   6 +
 .../net9.0/ConsoleApp1.gold                   |  31 ++
 .../net9.0/DynamicAssemblyCreation.gold       |   6 +
 .../net9.0/DynamicAssemblyLoading.gold        |   6 +
 .../net9.0/ExceptionTryCatchFinally.gold      |  20 +
 .../net9.0/ExceptionTryCatchFinallyWhen.gold  |  13 +
 .../net9.0/FileWriteProject.gold              |  26 +
 .../net9.0/FinalizableObject.gold             | 209 ++++++++
 .../net9.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net9.0/LOHAllocations.gold                |   6 +
 .../net9.0/NotExistingAssemblyLoading.gold    |  31 ++
 .../net9.0/SystemArrayPooling.gold            |   6 +
 .../net9.0/TaskTestProject1.gold              |  13 +
 .../net9.0/UnsafeFixed.gold                   |   6 +
 .../net8.0/ConsoleApp1.gold                   |  42 ++
 .../net8.0/DynamicAssemblyCreation.gold       |   6 +
 .../net8.0/DynamicAssemblyLoading.gold        |   6 +
 .../net8.0/ExceptionTryCatchFinally.gold      |  22 +
 .../net8.0/ExceptionTryCatchFinallyWhen.gold  |  14 +
 .../net8.0/FileWriteProject.gold              |  34 ++
 .../net8.0/FinalizableObject.gold             | 506 ++++++++++++++++++
 .../net8.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net8.0/LOHAllocations.gold                |   6 +
 .../net8.0/NotExistingAssemblyLoading.gold    |  40 ++
 .../net8.0/SystemArrayPooling.gold            |   6 +
 .../net8.0/TaskTestProject1.gold              |  26 +
 .../net8.0/UnsafeFixed.gold                   |   6 +
 .../net9.0/ConsoleApp1.gold                   |  42 ++
 .../net9.0/DynamicAssemblyCreation.gold       |   6 +
 .../net9.0/DynamicAssemblyLoading.gold        |   6 +
 .../net9.0/ExceptionTryCatchFinally.gold      |  22 +
 .../net9.0/ExceptionTryCatchFinallyWhen.gold  |  14 +
 .../net9.0/FileWriteProject.gold              |  34 ++
 .../net9.0/FinalizableObject.gold             | 506 ++++++++++++++++++
 .../net9.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net9.0/LOHAllocations.gold                |   6 +
 .../net9.0/NotExistingAssemblyLoading.gold    |  40 ++
 .../net9.0/SystemArrayPooling.gold            |   6 +
 .../net9.0/TaskTestProject1.gold              |  26 +
 .../net9.0/UnsafeFixed.gold                   |   6 +
 .../net8.0/ConsoleApp1.gold                   |  10 +
 .../net8.0/DynamicAssemblyCreation.gold       |   2 +
 .../net8.0/DynamicAssemblyLoading.gold        |   2 +
 .../net8.0/ExceptionTryCatchFinally.gold      |   6 +
 .../net8.0/ExceptionTryCatchFinallyWhen.gold  |   4 +
 .../net8.0/FileWriteProject.gold              |   8 +
 .../net8.0/FinalizableObject.gold             | 102 ++++
 .../net8.0/IntensiveThreadPoolUse.gold        |   2 +
 .../net8.0/LOHAllocations.gold                |   2 +
 .../net8.0/NotExistingAssemblyLoading.gold    |  10 +
 .../MethodsStartEndTests/net8.0/Sockets.gold  | 120 +++++
 .../net8.0/SystemArrayPooling.gold            |   2 +
 .../net8.0/TaskTestProject1.gold              |   4 +
 .../net8.0/UnsafeFixed.gold                   |   2 +
 .../net9.0/ConsoleApp1.gold                   |  10 +
 .../net9.0/DynamicAssemblyCreation.gold       |   2 +
 .../net9.0/DynamicAssemblyLoading.gold        |   2 +
 .../net9.0/ExceptionTryCatchFinally.gold      |   6 +
 .../net9.0/ExceptionTryCatchFinallyWhen.gold  |   4 +
 .../net9.0/FileWriteProject.gold              |   8 +
 .../net9.0/FinalizableObject.gold             | 102 ++++
 .../net9.0/IntensiveThreadPoolUse.gold        |   2 +
 .../net9.0/LOHAllocations.gold                |   2 +
 .../net9.0/NotExistingAssemblyLoading.gold    |  10 +
 .../MethodsStartEndTests/net9.0/Sockets.gold  | 120 +++++
 .../net9.0/SystemArrayPooling.gold            |   2 +
 .../net9.0/TaskTestProject1.gold              |   4 +
 .../net9.0/UnsafeFixed.gold                   |   2 +
 .../{net10.0 => }/SimpleTest.gold             |   0
 .../{net10.0 => }/SimpleTest2.gold            |   0
 .../{net10.0 => }/SimpleTest3.gold            |   0
 .../net8.0/AsyncAwait.gold                    | 236 ++++++++
 .../net8.0/AsyncAwaitTaskFactoryNew.gold      |  30 ++
 .../net8.0/AsyncDisposable.gold               |  68 +++
 .../net8.0/AwaitForeach.gold                  | 286 ++++++++++
 .../net8.0/NotSimpleAsyncAwait.gold           | 280 ++++++++++
 .../net8.0/SimpleAsyncAwait.gold              |  36 ++
 .../net9.0/AsyncAwait.gold                    | 236 ++++++++
 .../net9.0/AsyncAwaitTaskFactoryNew.gold      |  30 ++
 .../net9.0/AsyncDisposable.gold               |  68 +++
 .../net9.0/AwaitForeach.gold                  | 286 ++++++++++
 .../net9.0/NotSimpleAsyncAwait.gold           | 280 ++++++++++
 .../net9.0/SimpleAsyncAwait.gold              |  36 ++
 .../net8.0/TestAsyncAwait.gold                | 236 ++++++++
 .../net8.0/TestAsyncAwaitTaskFactoryNew.gold  |  30 ++
 .../net8.0/TestAsyncDisposable.gold           |  68 +++
 .../net8.0/TestAwaitForeach.gold              | 286 ++++++++++
 .../net8.0/TestNotSimpleAsync.gold            | 280 ++++++++++
 .../net8.0/TestSimpleAsyncAwait.gold          |  36 ++
 .../net9.0/TestAsyncAwait.gold                | 236 ++++++++
 .../net9.0/TestAsyncAwaitTaskFactoryNew.gold  |  30 ++
 .../net9.0/TestAsyncDisposable.gold           |  68 +++
 .../net9.0/TestAwaitForeach.gold              | 286 ++++++++++
 .../net9.0/TestNotSimpleAsync.gold            | 280 ++++++++++
 .../net9.0/TestSimpleAsyncAwait.gold          |  36 ++
 .../net8.0/ConsoleApp1.gold                   |  41 ++
 .../net8.0/DynamicAssemblyCreation.gold       |   6 +
 .../net8.0/DynamicAssemblyLoading.gold        |   6 +
 .../net8.0/ExceptionTryCatchFinally.gold      |  22 +
 .../net8.0/ExceptionTryCatchFinallyWhen.gold  |  14 +
 .../net8.0/FileWriteProject.gold              |  34 ++
 .../net8.0/FinalizableObject.gold             | 259 +++++++++
 .../net8.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net8.0/LOHAllocations.gold                |   6 +
 .../net8.0/NotExistingAssemblyLoading.gold    |  40 ++
 .../net8.0/SystemArrayPooling.gold            |   6 +
 .../net8.0/TaskTestProject1.gold              |  14 +
 .../net8.0/UnsafeFixed.gold                   |   6 +
 .../net9.0/ConsoleApp1.gold                   |  41 ++
 .../net9.0/DynamicAssemblyCreation.gold       |   6 +
 .../net9.0/DynamicAssemblyLoading.gold        |   6 +
 .../net9.0/ExceptionTryCatchFinally.gold      |  22 +
 .../net9.0/ExceptionTryCatchFinallyWhen.gold  |  14 +
 .../net9.0/FileWriteProject.gold              |  34 ++
 .../net9.0/FinalizableObject.gold             | 259 +++++++++
 .../net9.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net9.0/LOHAllocations.gold                |   6 +
 .../net9.0/NotExistingAssemblyLoading.gold    |  40 ++
 .../net9.0/SystemArrayPooling.gold            |   6 +
 .../net9.0/TaskTestProject1.gold              |  14 +
 .../net9.0/UnsafeFixed.gold                   |   6 +
 .../net8.0/ConsoleApp1.gold                   |  31 ++
 .../net8.0/DynamicAssemblyCreation.gold       |   6 +
 .../net8.0/DynamicAssemblyLoading.gold        |   6 +
 .../net8.0/ExceptionTryCatchFinally.gold      |  20 +
 .../net8.0/ExceptionTryCatchFinallyWhen.gold  |  13 +
 .../net8.0/FileWriteProject.gold              |  26 +
 .../net8.0/FinalizableObject.gold             | 209 ++++++++
 .../net8.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net8.0/LOHAllocations.gold                |   6 +
 .../net8.0/NotExistingAssemblyLoading.gold    |  31 ++
 .../net8.0/SystemArrayPooling.gold            |   6 +
 .../net8.0/TaskTestProject1.gold              |  13 +
 .../net8.0/UnsafeFixed.gold                   |   6 +
 .../net9.0/ConsoleApp1.gold                   |  31 ++
 .../net9.0/DynamicAssemblyCreation.gold       |   6 +
 .../net9.0/DynamicAssemblyLoading.gold        |   6 +
 .../net9.0/ExceptionTryCatchFinally.gold      |  20 +
 .../net9.0/ExceptionTryCatchFinallyWhen.gold  |  13 +
 .../net9.0/FileWriteProject.gold              |  26 +
 .../net9.0/FinalizableObject.gold             | 209 ++++++++
 .../net9.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net9.0/LOHAllocations.gold                |   6 +
 .../net9.0/NotExistingAssemblyLoading.gold    |  31 ++
 .../net9.0/SystemArrayPooling.gold            |   6 +
 .../net9.0/TaskTestProject1.gold              |  13 +
 .../net9.0/UnsafeFixed.gold                   |   6 +
 .../net8.0/ConsoleApp1.gold                   |  42 ++
 .../net8.0/DynamicAssemblyCreation.gold       |   6 +
 .../net8.0/DynamicAssemblyLoading.gold        |   6 +
 .../net8.0/ExceptionTryCatchFinally.gold      |  22 +
 .../net8.0/ExceptionTryCatchFinallyWhen.gold  |  14 +
 .../net8.0/FileWriteProject.gold              |  34 ++
 .../net8.0/FinalizableObject.gold             | 506 ++++++++++++++++++
 .../net8.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net8.0/LOHAllocations.gold                |   6 +
 .../net8.0/NotExistingAssemblyLoading.gold    |  40 ++
 .../net8.0/SystemArrayPooling.gold            |   6 +
 .../net8.0/TaskTestProject1.gold              |  26 +
 .../net8.0/UnsafeFixed.gold                   |   6 +
 .../net9.0/ConsoleApp1.gold                   |  42 ++
 .../net9.0/DynamicAssemblyCreation.gold       |   6 +
 .../net9.0/DynamicAssemblyLoading.gold        |   6 +
 .../net9.0/ExceptionTryCatchFinally.gold      |  22 +
 .../net9.0/ExceptionTryCatchFinallyWhen.gold  |  14 +
 .../net9.0/FileWriteProject.gold              |  34 ++
 .../net9.0/FinalizableObject.gold             | 506 ++++++++++++++++++
 .../net9.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net9.0/LOHAllocations.gold                |   6 +
 .../net9.0/NotExistingAssemblyLoading.gold    |  40 ++
 .../net9.0/SystemArrayPooling.gold            |   6 +
 .../net9.0/TaskTestProject1.gold              |  26 +
 .../net9.0/UnsafeFixed.gold                   |   6 +
 .../net8.0/ConsoleApp1.gold                   |  10 +
 .../net8.0/DynamicAssemblyCreation.gold       |   2 +
 .../net8.0/DynamicAssemblyLoading.gold        |   2 +
 .../net8.0/ExceptionTryCatchFinally.gold      |   6 +
 .../net8.0/ExceptionTryCatchFinallyWhen.gold  |   4 +
 .../net8.0/FileWriteProject.gold              |   8 +
 .../net8.0/FinalizableObject.gold             | 102 ++++
 .../net8.0/IntensiveThreadPoolUse.gold        |   2 +
 .../net8.0/LOHAllocations.gold                |   2 +
 .../net8.0/NotExistingAssemblyLoading.gold    |  10 +
 .../MethodsStartEndTests/net8.0/Sockets.gold  | 120 +++++
 .../net8.0/SystemArrayPooling.gold            |   2 +
 .../net8.0/TaskTestProject1.gold              |   4 +
 .../net8.0/UnsafeFixed.gold                   |   2 +
 .../net9.0/ConsoleApp1.gold                   |  10 +
 .../net9.0/DynamicAssemblyCreation.gold       |   2 +
 .../net9.0/DynamicAssemblyLoading.gold        |   2 +
 .../net9.0/ExceptionTryCatchFinally.gold      |   6 +
 .../net9.0/ExceptionTryCatchFinallyWhen.gold  |   4 +
 .../net9.0/FileWriteProject.gold              |   8 +
 .../net9.0/FinalizableObject.gold             | 102 ++++
 .../net9.0/IntensiveThreadPoolUse.gold        |   2 +
 .../net9.0/LOHAllocations.gold                |   2 +
 .../net9.0/NotExistingAssemblyLoading.gold    |  10 +
 .../MethodsStartEndTests/net9.0/Sockets.gold  | 120 +++++
 .../net9.0/SystemArrayPooling.gold            |   2 +
 .../net9.0/TaskTestProject1.gold              |   4 +
 .../net9.0/UnsafeFixed.gold                   |   2 +
 .../{net10.0 => }/SimpleTest.gold             |   0
 .../{net10.0 => }/SimpleTest2.gold            |   0
 .../{net10.0 => }/SimpleTest3.gold            |   0
 .../net8.0/AsyncAwait.gold                    | 236 ++++++++
 .../net8.0/AsyncAwaitTaskFactoryNew.gold      |  30 ++
 .../net8.0/AsyncDisposable.gold               |  68 +++
 .../net8.0/AwaitForeach.gold                  | 286 ++++++++++
 .../net8.0/NotSimpleAsyncAwait.gold           | 280 ++++++++++
 .../net8.0/SimpleAsyncAwait.gold              |  36 ++
 .../net9.0/AsyncAwait.gold                    | 236 ++++++++
 .../net9.0/AsyncAwaitTaskFactoryNew.gold      |  30 ++
 .../net9.0/AsyncDisposable.gold               |  68 +++
 .../net9.0/AwaitForeach.gold                  | 286 ++++++++++
 .../net9.0/NotSimpleAsyncAwait.gold           | 280 ++++++++++
 .../net9.0/SimpleAsyncAwait.gold              |  36 ++
 .../net8.0/TestAsyncAwait.gold                | 236 ++++++++
 .../net8.0/TestAsyncAwaitTaskFactoryNew.gold  |  30 ++
 .../net8.0/TestAsyncDisposable.gold           |  68 +++
 .../net8.0/TestAwaitForeach.gold              | 286 ++++++++++
 .../net8.0/TestNotSimpleAsync.gold            | 280 ++++++++++
 .../net8.0/TestSimpleAsyncAwait.gold          |  36 ++
 .../net9.0/TestAsyncAwait.gold                | 236 ++++++++
 .../net9.0/TestAsyncAwaitTaskFactoryNew.gold  |  30 ++
 .../net9.0/TestAsyncDisposable.gold           |  68 +++
 .../net9.0/TestAwaitForeach.gold              | 286 ++++++++++
 .../net9.0/TestNotSimpleAsync.gold            | 280 ++++++++++
 .../net9.0/TestSimpleAsyncAwait.gold          |  36 ++
 .../net8.0/ConsoleApp1.gold                   |  41 ++
 .../net8.0/DynamicAssemblyCreation.gold       |   6 +
 .../net8.0/DynamicAssemblyLoading.gold        |   6 +
 .../net8.0/ExceptionTryCatchFinally.gold      |  22 +
 .../net8.0/ExceptionTryCatchFinallyWhen.gold  |  14 +
 .../net8.0/FileWriteProject.gold              |  34 ++
 .../net8.0/FinalizableObject.gold             | 259 +++++++++
 .../net8.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net8.0/LOHAllocations.gold                |   6 +
 .../net8.0/NotExistingAssemblyLoading.gold    |  40 ++
 .../ByMethodSplitTests/net8.0/Sockets.gold    |   8 +
 .../net8.0/SystemArrayPooling.gold            |   6 +
 .../net8.0/TaskTestProject1.gold              |  14 +
 .../net8.0/UnsafeFixed.gold                   |   6 +
 .../net9.0/ConsoleApp1.gold                   |  41 ++
 .../net9.0/DynamicAssemblyCreation.gold       |   6 +
 .../net9.0/DynamicAssemblyLoading.gold        |   6 +
 .../net9.0/ExceptionTryCatchFinally.gold      |  22 +
 .../net9.0/ExceptionTryCatchFinallyWhen.gold  |  14 +
 .../net9.0/FileWriteProject.gold              |  34 ++
 .../net9.0/FinalizableObject.gold             | 259 +++++++++
 .../net9.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net9.0/LOHAllocations.gold                |   6 +
 .../net9.0/NotExistingAssemblyLoading.gold    |  40 ++
 .../ByMethodSplitTests/net9.0/Sockets.gold    |   8 +
 .../net9.0/SystemArrayPooling.gold            |   6 +
 .../net9.0/TaskTestProject1.gold              |  14 +
 .../net9.0/UnsafeFixed.gold                   |   6 +
 .../net8.0/ConsoleApp1.gold                   |  31 ++
 .../net8.0/DynamicAssemblyCreation.gold       |   6 +
 .../net8.0/DynamicAssemblyLoading.gold        |   6 +
 .../net8.0/ExceptionTryCatchFinally.gold      |  20 +
 .../net8.0/ExceptionTryCatchFinallyWhen.gold  |  13 +
 .../net8.0/FileWriteProject.gold              |  26 +
 .../net8.0/FinalizableObject.gold             | 209 ++++++++
 .../net8.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net8.0/LOHAllocations.gold                |   6 +
 .../net8.0/NotExistingAssemblyLoading.gold    |  31 ++
 .../net8.0/SystemArrayPooling.gold            |   6 +
 .../net8.0/TaskTestProject1.gold              |  13 +
 .../net8.0/UnsafeFixed.gold                   |   6 +
 .../net9.0/ConsoleApp1.gold                   |  31 ++
 .../net9.0/DynamicAssemblyCreation.gold       |   6 +
 .../net9.0/DynamicAssemblyLoading.gold        |   6 +
 .../net9.0/ExceptionTryCatchFinally.gold      |  20 +
 .../net9.0/ExceptionTryCatchFinallyWhen.gold  |  13 +
 .../net9.0/FileWriteProject.gold              |  26 +
 .../net9.0/FinalizableObject.gold             | 209 ++++++++
 .../net9.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net9.0/LOHAllocations.gold                |   6 +
 .../net9.0/NotExistingAssemblyLoading.gold    |  31 ++
 .../net9.0/SystemArrayPooling.gold            |   6 +
 .../net9.0/TaskTestProject1.gold              |  13 +
 .../net9.0/UnsafeFixed.gold                   |   6 +
 .../net8.0/ConsoleApp1.gold                   |  42 ++
 .../net8.0/DynamicAssemblyCreation.gold       |   6 +
 .../net8.0/DynamicAssemblyLoading.gold        |   6 +
 .../net8.0/ExceptionTryCatchFinally.gold      |  22 +
 .../net8.0/ExceptionTryCatchFinallyWhen.gold  |  14 +
 .../net8.0/FileWriteProject.gold              |  34 ++
 .../net8.0/FinalizableObject.gold             | 506 ++++++++++++++++++
 .../net8.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net8.0/LOHAllocations.gold                |   6 +
 .../net8.0/NotExistingAssemblyLoading.gold    |  40 ++
 .../net8.0/SystemArrayPooling.gold            |   6 +
 .../net8.0/TaskTestProject1.gold              |  26 +
 .../net8.0/UnsafeFixed.gold                   |   6 +
 .../net9.0/ConsoleApp1.gold                   |  42 ++
 .../net9.0/DynamicAssemblyCreation.gold       |   6 +
 .../net9.0/DynamicAssemblyLoading.gold        |   6 +
 .../net9.0/ExceptionTryCatchFinally.gold      |  22 +
 .../net9.0/ExceptionTryCatchFinallyWhen.gold  |  14 +
 .../net9.0/FileWriteProject.gold              |  34 ++
 .../net9.0/FinalizableObject.gold             | 506 ++++++++++++++++++
 .../net9.0/IntensiveThreadPoolUse.gold        |   6 +
 .../net9.0/LOHAllocations.gold                |   6 +
 .../net9.0/NotExistingAssemblyLoading.gold    |  40 ++
 .../net9.0/SystemArrayPooling.gold            |   6 +
 .../net9.0/TaskTestProject1.gold              |  26 +
 .../net9.0/UnsafeFixed.gold                   |   6 +
 .../net8.0/ConsoleApp1.gold                   |  10 +
 .../net8.0/DynamicAssemblyCreation.gold       |   2 +
 .../net8.0/DynamicAssemblyLoading.gold        |   2 +
 .../net8.0/ExceptionTryCatchFinally.gold      |   6 +
 .../net8.0/ExceptionTryCatchFinallyWhen.gold  |   4 +
 .../net8.0/FileWriteProject.gold              |   8 +
 .../net8.0/FinalizableObject.gold             | 102 ++++
 .../net8.0/IntensiveThreadPoolUse.gold        |   2 +
 .../net8.0/LOHAllocations.gold                |   2 +
 .../net8.0/NotExistingAssemblyLoading.gold    |  10 +
 .../MethodsStartEndTests/net8.0/Sockets.gold  |   8 +
 .../net8.0/SystemArrayPooling.gold            |   2 +
 .../net8.0/TaskTestProject1.gold              |   4 +
 .../net8.0/UnsafeFixed.gold                   |   2 +
 .../net9.0/ConsoleApp1.gold                   |  10 +
 .../net9.0/DynamicAssemblyCreation.gold       |   2 +
 .../net9.0/DynamicAssemblyLoading.gold        |   2 +
 .../net9.0/ExceptionTryCatchFinally.gold      |   6 +
 .../net9.0/ExceptionTryCatchFinallyWhen.gold  |   4 +
 .../net9.0/FileWriteProject.gold              |   8 +
 .../net9.0/FinalizableObject.gold             | 102 ++++
 .../net9.0/IntensiveThreadPoolUse.gold        |   2 +
 .../net9.0/LOHAllocations.gold                |   2 +
 .../net9.0/NotExistingAssemblyLoading.gold    |  10 +
 .../MethodsStartEndTests/net9.0/Sockets.gold  |   8 +
 .../net9.0/SystemArrayPooling.gold            |   2 +
 .../net9.0/TaskTestProject1.gold              |   4 +
 .../net9.0/UnsafeFixed.gold                   |   2 +
 .../{net10.0 => }/SimpleTest.gold             |   0
 .../{net10.0 => }/SimpleTest2.gold            |   0
 .../{net10.0 => }/SimpleTest3.gold            |   0
 .../net8.0/AsyncAwait.gold                    | 236 ++++++++
 .../net8.0/AsyncAwaitTaskFactoryNew.gold      |  30 ++
 .../net8.0/AsyncDisposable.gold               |  68 +++
 .../net8.0/AwaitForeach.gold                  | 286 ++++++++++
 .../net8.0/NotSimpleAsyncAwait.gold           | 280 ++++++++++
 .../net8.0/SimpleAsyncAwait.gold              |  36 ++
 .../net9.0/AsyncAwait.gold                    | 236 ++++++++
 .../net9.0/AsyncAwaitTaskFactoryNew.gold      |  30 ++
 .../net9.0/AsyncDisposable.gold               |  68 +++
 .../net9.0/AwaitForeach.gold                  | 286 ++++++++++
 .../net9.0/NotSimpleAsyncAwait.gold           | 280 ++++++++++
 .../net9.0/SimpleAsyncAwait.gold              |  36 ++
 401 files changed, 22034 insertions(+)
 create mode 100644 Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold
 create mode 100644 Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold
 create mode 100644 Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold
 create mode 100644 Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold
 create mode 100644 Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold
 create mode 100644 Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold
 create mode 100644 Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold
 create mode 100644 Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold
 create mode 100644 Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/Sockets.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/Sockets.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/UnsafeFixed.gold
 rename Procfiler/test_data/gold/linux/OcelEventsTest/{net10.0 => }/SimpleTest.gold (100%)
 rename Procfiler/test_data/gold/linux/OcelEventsTest/{net10.0 => }/SimpleTest2.gold (100%)
 rename Procfiler/test_data/gold/linux/OcelEventsTest/{net10.0 => }/SimpleTest3.gold (100%)
 create mode 100644 Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwaitTaskFactoryNew.gold
 create mode 100644 Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AsyncDisposable.gold
 create mode 100644 Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AwaitForeach.gold
 create mode 100644 Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/NotSimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/SimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwaitTaskFactoryNew.gold
 create mode 100644 Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AsyncDisposable.gold
 create mode 100644 Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AwaitForeach.gold
 create mode 100644 Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/NotSimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/SimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold
 create mode 100644 Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold
 create mode 100644 Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold
 create mode 100644 Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold
 create mode 100644 Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold
 create mode 100644 Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold
 create mode 100644 Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold
 create mode 100644 Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold
 create mode 100644 Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/Sockets.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/Sockets.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/UnsafeFixed.gold
 rename Procfiler/test_data/gold/macos/OcelEventsTest/{net10.0 => }/SimpleTest.gold (100%)
 rename Procfiler/test_data/gold/macos/OcelEventsTest/{net10.0 => }/SimpleTest2.gold (100%)
 rename Procfiler/test_data/gold/macos/OcelEventsTest/{net10.0 => }/SimpleTest3.gold (100%)
 create mode 100644 Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwaitTaskFactoryNew.gold
 create mode 100644 Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AsyncDisposable.gold
 create mode 100644 Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AwaitForeach.gold
 create mode 100644 Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/NotSimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/SimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwaitTaskFactoryNew.gold
 create mode 100644 Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AsyncDisposable.gold
 create mode 100644 Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AwaitForeach.gold
 create mode 100644 Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/NotSimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/SimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold
 create mode 100644 Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold
 create mode 100644 Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold
 create mode 100644 Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold
 create mode 100644 Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold
 create mode 100644 Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold
 create mode 100644 Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold
 create mode 100644 Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold
 create mode 100644 Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/Sockets.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/Sockets.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/Sockets.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/UnsafeFixed.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/ConsoleApp1.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/DynamicAssemblyCreation.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/DynamicAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/ExceptionTryCatchFinally.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/ExceptionTryCatchFinallyWhen.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/FileWriteProject.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/FinalizableObject.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/IntensiveThreadPoolUse.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/LOHAllocations.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/NotExistingAssemblyLoading.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/Sockets.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/SystemArrayPooling.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/TaskTestProject1.gold
 create mode 100644 Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/UnsafeFixed.gold
 rename Procfiler/test_data/gold/windows/OcelEventsTest/{net10.0 => }/SimpleTest.gold (100%)
 rename Procfiler/test_data/gold/windows/OcelEventsTest/{net10.0 => }/SimpleTest2.gold (100%)
 rename Procfiler/test_data/gold/windows/OcelEventsTest/{net10.0 => }/SimpleTest3.gold (100%)
 create mode 100644 Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwaitTaskFactoryNew.gold
 create mode 100644 Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AsyncDisposable.gold
 create mode 100644 Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AwaitForeach.gold
 create mode 100644 Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/NotSimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/SimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwaitTaskFactoryNew.gold
 create mode 100644 Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AsyncDisposable.gold
 create mode 100644 Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AwaitForeach.gold
 create mode 100644 Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/NotSimpleAsyncAwait.gold
 create mode 100644 Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/SimpleAsyncAwait.gold

diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold
new file mode 100644
index 000000000..7178bff37
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold
@@ -0,0 +1,236 @@
+ASYNC_AsyncAwait.Program+<Main>d__0
+Trace:
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method1>d__1
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method2>d__2
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method3>d__3
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold
new file mode 100644
index 000000000..76edaf195
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold
@@ -0,0 +1,30 @@
+ASYNC_AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+			[start] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwaitTaskFactoryNew.Program+<Main>d__0
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+			[start] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold
new file mode 100644
index 000000000..65c86d99d
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold
@@ -0,0 +1,68 @@
+ASYNC_AsyncDisposable.Program+<Main>d__0
+Trace:
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+				[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncDisposable.Program+<Method1>d__1
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0
+Trace:
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold
new file mode 100644
index 000000000..5507003cc
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold
@@ -0,0 +1,286 @@
+ASYNC_AwaitForeach.Program+<Allocate>d__2
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+
+ASYNC_AwaitForeach.Program+<EnumerateAsync>d__1
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AwaitForeach.Program+<Main>d__0
+Trace:
+	[start] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+		[ end ] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold
new file mode 100644
index 000000000..a366446ba
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold
@@ -0,0 +1,280 @@
+ASYNC_NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+
+ASYNC_NotSimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold
new file mode 100644
index 000000000..e8d7db06a
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold
@@ -0,0 +1,36 @@
+ASYNC_SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d
+Trace:
+	[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+	[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+
+
+ASYNC_SimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+			[start] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+		[start] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+			[start] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+			[start] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+		[start] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+		[start] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+			[start] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold
new file mode 100644
index 000000000..7178bff37
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold
@@ -0,0 +1,236 @@
+ASYNC_AsyncAwait.Program+<Main>d__0
+Trace:
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method1>d__1
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method2>d__2
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method3>d__3
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold
new file mode 100644
index 000000000..76edaf195
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold
@@ -0,0 +1,30 @@
+ASYNC_AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+			[start] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwaitTaskFactoryNew.Program+<Main>d__0
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+			[start] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold
new file mode 100644
index 000000000..65c86d99d
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold
@@ -0,0 +1,68 @@
+ASYNC_AsyncDisposable.Program+<Main>d__0
+Trace:
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+				[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncDisposable.Program+<Method1>d__1
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0
+Trace:
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold
new file mode 100644
index 000000000..5507003cc
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold
@@ -0,0 +1,286 @@
+ASYNC_AwaitForeach.Program+<Allocate>d__2
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+
+ASYNC_AwaitForeach.Program+<EnumerateAsync>d__1
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AwaitForeach.Program+<Main>d__0
+Trace:
+	[start] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+		[ end ] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold
new file mode 100644
index 000000000..a366446ba
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold
@@ -0,0 +1,280 @@
+ASYNC_NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+
+ASYNC_NotSimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold
new file mode 100644
index 000000000..e8d7db06a
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold
@@ -0,0 +1,36 @@
+ASYNC_SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d
+Trace:
+	[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+	[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+
+
+ASYNC_SimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+			[start] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+		[start] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+			[start] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+			[start] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+		[start] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+		[start] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+			[start] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/ConsoleApp1.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/ConsoleApp1.gold
new file mode 100644
index 000000000..93a2b1d29
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/ConsoleApp1.gold
@@ -0,0 +1,41 @@
+Method: ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+Trace 1
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Method: ConsoleApp1.Program.Main[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+Method: ConsoleApp1.Program.Method1[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+Method: ConsoleApp1.Program.Method2[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..c0319364a
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..0babdbe1b
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+Method: dynamicassemblyloading!Program.<Main>$(class System.String[])
+
+Trace 0
+	[start] dynamicassemblyloading!Program.<Main>$(class System.String[])
+	[ end ] dynamicassemblyloading!Program.<Main>$(class System.String[])
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..07bd7bf20
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,22 @@
+Method: ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Method: ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Method: ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..ec77375cb
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,14 @@
+Method: ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Method: ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/FileWriteProject.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/FileWriteProject.gold
new file mode 100644
index 000000000..c1e99db14
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/FileWriteProject.gold
@@ -0,0 +1,34 @@
+Method: FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Method: FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Method: FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Method: FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/FinalizableObject.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/FinalizableObject.gold
new file mode 100644
index 000000000..c577c2f5b
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/FinalizableObject.gold
@@ -0,0 +1,259 @@
+Method: FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace 0
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 1
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 2
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 3
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 4
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 5
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 6
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 7
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 8
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 9
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 10
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 11
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 12
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 13
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 14
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 15
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 16
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 17
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 18
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 19
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 20
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 21
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 22
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 23
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 24
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 25
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 26
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 27
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 28
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 29
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 30
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 31
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 32
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 33
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 34
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 35
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 36
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 37
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 38
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 39
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 40
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 41
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 42
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 43
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 44
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 45
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 46
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 47
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 48
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 49
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Method: FinalizableObject.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..7f83655d3
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+Method: IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/LOHAllocations.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/LOHAllocations.gold
new file mode 100644
index 000000000..404678d94
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+Method: LOHAllocations.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..9f8f8ac7a
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,40 @@
+Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..4d58a3f5c
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+Method: SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/TaskTestProject1.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/TaskTestProject1.gold
new file mode 100644
index 000000000..187509991
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/TaskTestProject1.gold
@@ -0,0 +1,14 @@
+Method: TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Method: TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+Trace 0
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/UnsafeFixed.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/UnsafeFixed.gold
new file mode 100644
index 000000000..2f0b0664f
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net8.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+Method: UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/ConsoleApp1.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/ConsoleApp1.gold
new file mode 100644
index 000000000..93a2b1d29
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/ConsoleApp1.gold
@@ -0,0 +1,41 @@
+Method: ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+Trace 1
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Method: ConsoleApp1.Program.Main[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+Method: ConsoleApp1.Program.Method1[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+Method: ConsoleApp1.Program.Method2[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..c0319364a
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..0babdbe1b
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+Method: dynamicassemblyloading!Program.<Main>$(class System.String[])
+
+Trace 0
+	[start] dynamicassemblyloading!Program.<Main>$(class System.String[])
+	[ end ] dynamicassemblyloading!Program.<Main>$(class System.String[])
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..07bd7bf20
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,22 @@
+Method: ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Method: ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Method: ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..ec77375cb
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,14 @@
+Method: ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Method: ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/FileWriteProject.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/FileWriteProject.gold
new file mode 100644
index 000000000..c1e99db14
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/FileWriteProject.gold
@@ -0,0 +1,34 @@
+Method: FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Method: FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Method: FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Method: FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/FinalizableObject.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/FinalizableObject.gold
new file mode 100644
index 000000000..c577c2f5b
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/FinalizableObject.gold
@@ -0,0 +1,259 @@
+Method: FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace 0
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 1
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 2
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 3
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 4
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 5
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 6
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 7
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 8
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 9
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 10
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 11
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 12
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 13
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 14
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 15
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 16
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 17
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 18
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 19
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 20
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 21
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 22
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 23
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 24
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 25
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 26
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 27
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 28
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 29
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 30
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 31
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 32
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 33
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 34
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 35
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 36
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 37
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 38
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 39
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 40
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 41
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 42
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 43
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 44
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 45
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 46
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 47
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 48
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 49
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Method: FinalizableObject.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..7f83655d3
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+Method: IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/LOHAllocations.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/LOHAllocations.gold
new file mode 100644
index 000000000..404678d94
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+Method: LOHAllocations.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..9f8f8ac7a
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,40 @@
+Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..4d58a3f5c
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+Method: SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/TaskTestProject1.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/TaskTestProject1.gold
new file mode 100644
index 000000000..187509991
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/TaskTestProject1.gold
@@ -0,0 +1,14 @@
+Method: TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Method: TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+Trace 0
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/UnsafeFixed.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/UnsafeFixed.gold
new file mode 100644
index 000000000..2f0b0664f
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTests/net9.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+Method: UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/ConsoleApp1.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/ConsoleApp1.gold
new file mode 100644
index 000000000..568b71ad9
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/ConsoleApp1.gold
@@ -0,0 +1,31 @@
+Method: ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+Trace 1
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Method: ConsoleApp1.Program.Main[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Main[void..()]
+	[exec]ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+Method: ConsoleApp1.Program.Method1[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method1[void..()]
+	[exec]ConsoleApp1.Program..ctor[instance.void..()]
+	[exec]ConsoleApp1.Program.Method2[void..()]
+	[exec]ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+Method: ConsoleApp1.Program.Method2[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..c0319364a
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..5cc114007
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..a133519e8
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,20 @@
+Method: ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Method: ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Method: ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+	[exec]ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[exec]ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..e5b82c86c
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,13 @@
+Method: ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Method: ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+	[exec]ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/FileWriteProject.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/FileWriteProject.gold
new file mode 100644
index 000000000..439404490
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/FileWriteProject.gold
@@ -0,0 +1,26 @@
+Method: FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+	[exec]FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Method: FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[exec]FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Method: FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Method: FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/FinalizableObject.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/FinalizableObject.gold
new file mode 100644
index 000000000..99f103fb9
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/FinalizableObject.gold
@@ -0,0 +1,209 @@
+Method: FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace 0
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 1
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 2
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 3
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 4
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 5
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 6
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 7
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 8
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 9
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 10
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 11
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 12
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 13
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 14
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 15
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 16
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 17
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 18
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 19
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 20
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 21
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 22
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 23
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 24
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 25
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 26
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 27
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 28
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 29
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 30
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 31
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 32
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 33
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 34
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 35
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 36
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 37
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 38
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 39
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 40
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 41
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 42
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 43
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 44
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 45
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 46
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 47
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 48
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 49
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Method: FinalizableObject.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..7f83655d3
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+Method: IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/LOHAllocations.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/LOHAllocations.gold
new file mode 100644
index 000000000..404678d94
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+Method: LOHAllocations.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..b4ed29bf1
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,31 @@
+Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+	[exec]NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..4d58a3f5c
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+Method: SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/TaskTestProject1.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/TaskTestProject1.gold
new file mode 100644
index 000000000..419e89a13
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/TaskTestProject1.gold
@@ -0,0 +1,13 @@
+Method: TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+	[exec]TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Method: TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+Trace 0
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/UnsafeFixed.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/UnsafeFixed.gold
new file mode 100644
index 000000000..2f0b0664f
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+Method: UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/ConsoleApp1.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/ConsoleApp1.gold
new file mode 100644
index 000000000..568b71ad9
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/ConsoleApp1.gold
@@ -0,0 +1,31 @@
+Method: ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+Trace 1
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Method: ConsoleApp1.Program.Main[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Main[void..()]
+	[exec]ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+Method: ConsoleApp1.Program.Method1[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method1[void..()]
+	[exec]ConsoleApp1.Program..ctor[instance.void..()]
+	[exec]ConsoleApp1.Program.Method2[void..()]
+	[exec]ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+Method: ConsoleApp1.Program.Method2[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..c0319364a
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..5cc114007
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..a133519e8
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,20 @@
+Method: ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Method: ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Method: ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+	[exec]ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[exec]ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..e5b82c86c
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,13 @@
+Method: ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Method: ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+	[exec]ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/FileWriteProject.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/FileWriteProject.gold
new file mode 100644
index 000000000..439404490
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/FileWriteProject.gold
@@ -0,0 +1,26 @@
+Method: FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+	[exec]FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Method: FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[exec]FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Method: FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Method: FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/FinalizableObject.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/FinalizableObject.gold
new file mode 100644
index 000000000..99f103fb9
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/FinalizableObject.gold
@@ -0,0 +1,209 @@
+Method: FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace 0
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 1
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 2
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 3
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 4
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 5
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 6
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 7
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 8
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 9
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 10
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 11
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 12
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 13
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 14
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 15
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 16
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 17
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 18
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 19
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 20
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 21
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 22
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 23
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 24
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 25
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 26
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 27
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 28
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 29
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 30
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 31
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 32
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 33
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 34
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 35
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 36
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 37
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 38
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 39
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 40
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 41
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 42
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 43
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 44
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 45
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 46
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 47
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 48
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 49
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Method: FinalizableObject.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..7f83655d3
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+Method: IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/LOHAllocations.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/LOHAllocations.gold
new file mode 100644
index 000000000..404678d94
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+Method: LOHAllocations.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..b4ed29bf1
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,31 @@
+Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+	[exec]NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..4d58a3f5c
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+Method: SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/TaskTestProject1.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/TaskTestProject1.gold
new file mode 100644
index 000000000..419e89a13
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/TaskTestProject1.gold
@@ -0,0 +1,13 @@
+Method: TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+	[exec]TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Method: TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+Trace 0
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/UnsafeFixed.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/UnsafeFixed.gold
new file mode 100644
index 000000000..2f0b0664f
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+Method: UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/ConsoleApp1.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/ConsoleApp1.gold
new file mode 100644
index 000000000..ef7620b97
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/ConsoleApp1.gold
@@ -0,0 +1,42 @@
+ConsoleApp1.Program..ctor[instance.void..()]
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+
+ConsoleApp1.Program.Main[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+
+ConsoleApp1.Program.Method1[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+
+ConsoleApp1.Program.Method2[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..fb60809b4
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..8694b6435
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..ccbf81c23
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,22 @@
+ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+Trace:
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+
+ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+Trace:
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+
+ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..cffb8cdce
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,14 @@
+ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+Trace:
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+
+ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/FileWriteProject.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/FileWriteProject.gold
new file mode 100644
index 000000000..aacd69ad4
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/FileWriteProject.gold
@@ -0,0 +1,34 @@
+FileWriteProject.Program.<Main>[void..(class.System.String[])]
+Trace:
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+
+FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+Trace:
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+
+FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+Trace:
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+
+FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+Trace:
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/FinalizableObject.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/FinalizableObject.gold
new file mode 100644
index 000000000..5ea326df0
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/FinalizableObject.gold
@@ -0,0 +1,506 @@
+FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+
+FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+
+FinalizableObject.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..f7d4f346b
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/LOHAllocations.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/LOHAllocations.gold
new file mode 100644
index 000000000..8319d613d
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+LOHAllocations.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..1642ba204
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,40 @@
+NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+
+NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+
+NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+
+NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+
+NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..ccd2759aa
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+SystemArrayPooling.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/TaskTestProject1.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/TaskTestProject1.gold
new file mode 100644
index 000000000..6687c221f
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/TaskTestProject1.gold
@@ -0,0 +1,26 @@
+TaskTestProject1.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/UnsafeFixed.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/UnsafeFixed.gold
new file mode 100644
index 000000000..cc637a95b
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net8.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+UnsafeFixed.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/ConsoleApp1.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/ConsoleApp1.gold
new file mode 100644
index 000000000..ef7620b97
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/ConsoleApp1.gold
@@ -0,0 +1,42 @@
+ConsoleApp1.Program..ctor[instance.void..()]
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+
+ConsoleApp1.Program.Main[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+
+ConsoleApp1.Program.Method1[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+
+ConsoleApp1.Program.Method2[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..fb60809b4
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..8694b6435
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..ccbf81c23
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,22 @@
+ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+Trace:
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+
+ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+Trace:
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+
+ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..cffb8cdce
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,14 @@
+ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+Trace:
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+
+ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/FileWriteProject.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/FileWriteProject.gold
new file mode 100644
index 000000000..aacd69ad4
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/FileWriteProject.gold
@@ -0,0 +1,34 @@
+FileWriteProject.Program.<Main>[void..(class.System.String[])]
+Trace:
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+
+FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+Trace:
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+
+FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+Trace:
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+
+FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+Trace:
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/FinalizableObject.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/FinalizableObject.gold
new file mode 100644
index 000000000..5ea326df0
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/FinalizableObject.gold
@@ -0,0 +1,506 @@
+FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+
+FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+
+FinalizableObject.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..f7d4f346b
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/LOHAllocations.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/LOHAllocations.gold
new file mode 100644
index 000000000..8319d613d
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+LOHAllocations.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..1642ba204
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,40 @@
+NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+
+NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+
+NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+
+NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+
+NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..ccd2759aa
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+SystemArrayPooling.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/TaskTestProject1.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/TaskTestProject1.gold
new file mode 100644
index 000000000..6687c221f
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/TaskTestProject1.gold
@@ -0,0 +1,26 @@
+TaskTestProject1.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+
+
diff --git a/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/UnsafeFixed.gold b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/UnsafeFixed.gold
new file mode 100644
index 000000000..cc637a95b
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/CompletedMethodsExecutionsTests/net9.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+UnsafeFixed.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/ConsoleApp1.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/ConsoleApp1.gold
new file mode 100644
index 000000000..465b6e7d7
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/ConsoleApp1.gold
@@ -0,0 +1,10 @@
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..aab87f6c1
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,2 @@
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..ca1be54ff
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,2 @@
+	[start] dynamicassemblyloading!Program.<Main>$(class System.String[])
+	[ end ] dynamicassemblyloading!Program.<Main>$(class System.String[])
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..a044449c0
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,6 @@
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..8983b0e1c
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,4 @@
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/FileWriteProject.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/FileWriteProject.gold
new file mode 100644
index 000000000..7677af6a3
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/FileWriteProject.gold
@@ -0,0 +1,8 @@
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/FinalizableObject.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/FinalizableObject.gold
new file mode 100644
index 000000000..e17b1820d
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/FinalizableObject.gold
@@ -0,0 +1,102 @@
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..9ed884af8
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,2 @@
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/LOHAllocations.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/LOHAllocations.gold
new file mode 100644
index 000000000..bce4efdf1
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/LOHAllocations.gold
@@ -0,0 +1,2 @@
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..953d09e03
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,10 @@
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/Sockets.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/Sockets.gold
new file mode 100644
index 000000000..0978b0fcc
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/Sockets.gold
@@ -0,0 +1,120 @@
+	[start] sockets!Program.<Main>(class System.String[])
+		[start] sockets!Program.<Main>$(class System.String[])
+			[start] sockets!Program+<<Main>$>d__0.MoveNext()
+				[start] system.net.sockets!System.Net.Sockets.TcpClient..ctor()
+					[start] system.net.sockets!System.Net.Sockets.TcpClient..ctor(value class System.Net.Sockets.AddressFamily)
+						[start] system.net.sockets!System.Net.NetEventSource..cctor()
+							[start] system.net.sockets!System.Net.NetEventSource..ctor()
+							[ end ] system.net.sockets!System.Net.NetEventSource..ctor()
+						[ end ] system.net.sockets!System.Net.NetEventSource..cctor()
+						[start] system.net.sockets!System.Net.NetEventSource..cctor()
+							[start] system.net.sockets!System.Net.NetEventSource..ctor()
+							[ end ] system.net.sockets!System.Net.NetEventSource..ctor()
+						[ end ] system.net.sockets!System.Net.NetEventSource..cctor()
+						[start] system.net.sockets!System.Net.Sockets.TcpClient.InitializeClientSocket()
+							[start] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+								[start] system.net.sockets!System.Net.Sockets.Socket.get_OSSupportsIPv6()
+									[start] system.net.sockets!System.Net.SocketProtocolSupportPal.get_OSSupportsIPv6()
+										[start] system.net.sockets!System.Net.SocketProtocolSupportPal..cctor()
+											[start] system.net.sockets!System.Net.SocketProtocolSupportPal.IsSupported(value class System.Net.Sockets.AddressFamily)
+											[ end ] system.net.sockets!System.Net.SocketProtocolSupportPal.IsSupported(value class System.Net.Sockets.AddressFamily)
+										[ end ] system.net.sockets!System.Net.SocketProtocolSupportPal..cctor()
+									[ end ] system.net.sockets!System.Net.SocketProtocolSupportPal.get_OSSupportsIPv6()
+								[ end ] system.net.sockets!System.Net.Sockets.Socket.get_OSSupportsIPv6()
+								[start] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+									[start] system.net.sockets!System.Net.Sockets.SocketPal.CreateSocket(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,class System.Net.Sockets.SafeSocketHandle&)
+									[ end ] system.net.sockets!System.Net.Sockets.SocketPal.CreateSocket(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,class System.Net.Sockets.SafeSocketHandle&)
+								[ end ] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+								[start] system.net.sockets!System.Net.Sockets.Socket.set_DualMode(bool)
+									[start] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+										[start] system.net.sockets!System.Net.Sockets.Socket.ThrowIfDisposed()
+										[ end ] system.net.sockets!System.Net.Sockets.Socket.ThrowIfDisposed()
+										[start] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32,bool)
+											[start] system.net.sockets!System.Net.Sockets.SocketPal.SetSockOpt(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+												[start] system.net.sockets!System.Net.Sockets.SocketPal.GetErrorAndTrackSetting(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,value class Error)
+												[ end ] system.net.sockets!System.Net.Sockets.SocketPal.GetErrorAndTrackSetting(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,value class Error)
+											[ end ] system.net.sockets!System.Net.Sockets.SocketPal.SetSockOpt(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+										[ end ] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32,bool)
+									[ end ] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+								[ end ] system.net.sockets!System.Net.Sockets.Socket.set_DualMode(bool)
+							[ end ] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+						[ end ] system.net.sockets!System.Net.Sockets.TcpClient.InitializeClientSocket()
+					[ end ] system.net.sockets!System.Net.Sockets.TcpClient..ctor(value class System.Net.Sockets.AddressFamily)
+				[ end ] system.net.sockets!System.Net.Sockets.TcpClient..ctor()
+				[start] system.net.sockets!System.Net.Sockets.TcpClient.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+					[start] system.net.sockets!System.Net.Sockets.TcpClient.get_Client()
+					[ end ] system.net.sockets!System.Net.Sockets.TcpClient.get_Client()
+					[start] system.net.sockets!System.Net.Sockets.Socket.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+						[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32)
+							[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32,value class System.Threading.CancellationToken)
+								[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.EndPoint,value class System.Threading.CancellationToken)
+									[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..ctor(class System.Net.Sockets.Socket,bool)
+										[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs..ctor(bool)
+										[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs..ctor(bool)
+									[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..ctor(class System.Net.Sockets.Socket,bool)
+									[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.ConnectAsync(class System.Net.Sockets.Socket)
+										[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.Sockets.SocketAsyncEventArgs,bool,bool)
+											[start] system.net.sockets!System.Net.Sockets.Socket.ValidateForMultiConnect(bool)
+												[start] system.net.sockets!System.Net.Sockets.Socket.ReplaceHandleIfNecessaryAfterFailedConnect()
+												[ end ] system.net.sockets!System.Net.Sockets.Socket.ReplaceHandleIfNecessaryAfterFailedConnect()
+											[ end ] system.net.sockets!System.Net.Sockets.Socket.ValidateForMultiConnect(bool)
+											[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.StartOperationCommon(class System.Net.Sockets.Socket,value class System.Net.Sockets.SocketAsyncOperation)
+												[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+													[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+												[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+													[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+												[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+													[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+											[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.StartOperationCommon(class System.Net.Sockets.Socket,value class System.Net.Sockets.SocketAsyncOperation)
+											[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.DnsConnectAsync(class System.Net.DnsEndPoint,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+												[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.CopyBufferFrom(class System.Net.Sockets.SocketAsyncEventArgs)
+													[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.Complete()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.Complete()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.CopyBufferFrom(class System.Net.Sockets.SocketAsyncEventArgs)
+												[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.<DnsConnectAsync>g__Core|112_0(class MultiConnectSocketAsyncEventArgs,class System.Threading.Tasks.Task`1<class System.Net.IPAddress[]>,int32,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,value class System.Threading.CancellationToken)
+													[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs+<<DnsConnectAsync>g__Core|112_0>d.MoveNext()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs+<<DnsConnectAsync>g__Core|112_0>d.MoveNext()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.<DnsConnectAsync>g__Core|112_0(class MultiConnectSocketAsyncEventArgs,class System.Threading.Tasks.Task`1<class System.Net.IPAddress[]>,int32,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,value class System.Threading.CancellationToken)
+											[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.DnsConnectAsync(class System.Net.DnsEndPoint,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+										[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.Sockets.SocketAsyncEventArgs,bool,bool)
+									[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.ConnectAsync(class System.Net.Sockets.Socket)
+									[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.GetStatus(int16)
+										[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..cctor()
+											[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs+<>c..cctor()
+											[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs+<>c..cctor()
+										[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..cctor()
+									[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.GetStatus(int16)
+								[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.EndPoint,value class System.Threading.CancellationToken)
+							[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32,value class System.Threading.CancellationToken)
+							[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.OnCompleted(class System.Action`1<class System.Object>,class System.Object,int16,value class System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags)
+							[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.OnCompleted(class System.Action`1<class System.Object>,class System.Object,int16,value class System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags)
+						[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32)
+						[start] system.net.sockets!System.Threading.Tasks.TaskToApm.Begin(class System.Threading.Tasks.Task,class System.AsyncCallback,class System.Object)
+						[ end ] system.net.sockets!System.Threading.Tasks.TaskToApm.Begin(class System.Threading.Tasks.Task,class System.AsyncCallback,class System.Object)
+					[ end ] system.net.sockets!System.Net.Sockets.Socket.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+				[ end ] system.net.sockets!System.Net.Sockets.TcpClient.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+				[start] system.net.sockets!System.Threading.Tasks.TaskToApm+TaskAsyncResult.get_AsyncWaitHandle()
+				[ end ] system.net.sockets!System.Threading.Tasks.TaskToApm+TaskAsyncResult.get_AsyncWaitHandle()
+				[start] system.net.sockets!System.Net.Sockets.NetworkStream.Write(value class System.ReadOnlySpan`1<unsigned int8>)
+					[start] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags)
+						[start] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,value class System.Net.Sockets.SocketError&)
+							[start] system.net.sockets!System.Net.Sockets.SocketPal.Send(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32&)
+								[start] system.net.sockets!System.Net.Sockets.SocketAsyncContext.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32,int32&)
+									[start] system.net.sockets!System.Net.Sockets.SocketAsyncContext.SendTo(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32,int32&)
+										[start] system.net.sockets!System.Net.Sockets.SocketPal.TryCompleteSendTo(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,class System.Collections.Generic.IList`1<value class System.ArraySegment`1<unsigned int8>>,int32&,int32&,int32&,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32&,value class System.Net.Sockets.SocketError&)
+										[ end ] system.net.sockets!System.Net.Sockets.SocketPal.TryCompleteSendTo(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,class System.Collections.Generic.IList`1<value class System.ArraySegment`1<unsigned int8>>,int32&,int32&,int32&,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32&,value class System.Net.Sockets.SocketError&)
+									[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncContext.SendTo(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32,int32&)
+								[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncContext.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32,int32&)
+							[ end ] system.net.sockets!System.Net.Sockets.SocketPal.Send(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32&)
+						[ end ] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,value class System.Net.Sockets.SocketError&)
+					[ end ] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags)
+				[ end ] system.net.sockets!System.Net.Sockets.NetworkStream.Write(value class System.ReadOnlySpan`1<unsigned int8>)
+			[ end ] sockets!Program+<<Main>$>d__0.MoveNext()
+		[ end ] sockets!Program.<Main>$(class System.String[])
+	[ end ] sockets!Program.<Main>(class System.String[])
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..f8f29e7dd
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/SystemArrayPooling.gold
@@ -0,0 +1,2 @@
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/TaskTestProject1.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/TaskTestProject1.gold
new file mode 100644
index 000000000..c8e5cb4db
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/TaskTestProject1.gold
@@ -0,0 +1,4 @@
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/UnsafeFixed.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/UnsafeFixed.gold
new file mode 100644
index 000000000..46ad3a5cf
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net8.0/UnsafeFixed.gold
@@ -0,0 +1,2 @@
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/ConsoleApp1.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/ConsoleApp1.gold
new file mode 100644
index 000000000..465b6e7d7
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/ConsoleApp1.gold
@@ -0,0 +1,10 @@
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..aab87f6c1
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,2 @@
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..ca1be54ff
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,2 @@
+	[start] dynamicassemblyloading!Program.<Main>$(class System.String[])
+	[ end ] dynamicassemblyloading!Program.<Main>$(class System.String[])
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..a044449c0
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,6 @@
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..8983b0e1c
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,4 @@
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/FileWriteProject.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/FileWriteProject.gold
new file mode 100644
index 000000000..7677af6a3
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/FileWriteProject.gold
@@ -0,0 +1,8 @@
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/FinalizableObject.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/FinalizableObject.gold
new file mode 100644
index 000000000..e17b1820d
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/FinalizableObject.gold
@@ -0,0 +1,102 @@
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..9ed884af8
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,2 @@
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/LOHAllocations.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/LOHAllocations.gold
new file mode 100644
index 000000000..bce4efdf1
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/LOHAllocations.gold
@@ -0,0 +1,2 @@
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..953d09e03
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,10 @@
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/Sockets.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/Sockets.gold
new file mode 100644
index 000000000..0978b0fcc
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/Sockets.gold
@@ -0,0 +1,120 @@
+	[start] sockets!Program.<Main>(class System.String[])
+		[start] sockets!Program.<Main>$(class System.String[])
+			[start] sockets!Program+<<Main>$>d__0.MoveNext()
+				[start] system.net.sockets!System.Net.Sockets.TcpClient..ctor()
+					[start] system.net.sockets!System.Net.Sockets.TcpClient..ctor(value class System.Net.Sockets.AddressFamily)
+						[start] system.net.sockets!System.Net.NetEventSource..cctor()
+							[start] system.net.sockets!System.Net.NetEventSource..ctor()
+							[ end ] system.net.sockets!System.Net.NetEventSource..ctor()
+						[ end ] system.net.sockets!System.Net.NetEventSource..cctor()
+						[start] system.net.sockets!System.Net.NetEventSource..cctor()
+							[start] system.net.sockets!System.Net.NetEventSource..ctor()
+							[ end ] system.net.sockets!System.Net.NetEventSource..ctor()
+						[ end ] system.net.sockets!System.Net.NetEventSource..cctor()
+						[start] system.net.sockets!System.Net.Sockets.TcpClient.InitializeClientSocket()
+							[start] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+								[start] system.net.sockets!System.Net.Sockets.Socket.get_OSSupportsIPv6()
+									[start] system.net.sockets!System.Net.SocketProtocolSupportPal.get_OSSupportsIPv6()
+										[start] system.net.sockets!System.Net.SocketProtocolSupportPal..cctor()
+											[start] system.net.sockets!System.Net.SocketProtocolSupportPal.IsSupported(value class System.Net.Sockets.AddressFamily)
+											[ end ] system.net.sockets!System.Net.SocketProtocolSupportPal.IsSupported(value class System.Net.Sockets.AddressFamily)
+										[ end ] system.net.sockets!System.Net.SocketProtocolSupportPal..cctor()
+									[ end ] system.net.sockets!System.Net.SocketProtocolSupportPal.get_OSSupportsIPv6()
+								[ end ] system.net.sockets!System.Net.Sockets.Socket.get_OSSupportsIPv6()
+								[start] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+									[start] system.net.sockets!System.Net.Sockets.SocketPal.CreateSocket(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,class System.Net.Sockets.SafeSocketHandle&)
+									[ end ] system.net.sockets!System.Net.Sockets.SocketPal.CreateSocket(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,class System.Net.Sockets.SafeSocketHandle&)
+								[ end ] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+								[start] system.net.sockets!System.Net.Sockets.Socket.set_DualMode(bool)
+									[start] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+										[start] system.net.sockets!System.Net.Sockets.Socket.ThrowIfDisposed()
+										[ end ] system.net.sockets!System.Net.Sockets.Socket.ThrowIfDisposed()
+										[start] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32,bool)
+											[start] system.net.sockets!System.Net.Sockets.SocketPal.SetSockOpt(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+												[start] system.net.sockets!System.Net.Sockets.SocketPal.GetErrorAndTrackSetting(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,value class Error)
+												[ end ] system.net.sockets!System.Net.Sockets.SocketPal.GetErrorAndTrackSetting(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,value class Error)
+											[ end ] system.net.sockets!System.Net.Sockets.SocketPal.SetSockOpt(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+										[ end ] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32,bool)
+									[ end ] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+								[ end ] system.net.sockets!System.Net.Sockets.Socket.set_DualMode(bool)
+							[ end ] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+						[ end ] system.net.sockets!System.Net.Sockets.TcpClient.InitializeClientSocket()
+					[ end ] system.net.sockets!System.Net.Sockets.TcpClient..ctor(value class System.Net.Sockets.AddressFamily)
+				[ end ] system.net.sockets!System.Net.Sockets.TcpClient..ctor()
+				[start] system.net.sockets!System.Net.Sockets.TcpClient.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+					[start] system.net.sockets!System.Net.Sockets.TcpClient.get_Client()
+					[ end ] system.net.sockets!System.Net.Sockets.TcpClient.get_Client()
+					[start] system.net.sockets!System.Net.Sockets.Socket.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+						[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32)
+							[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32,value class System.Threading.CancellationToken)
+								[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.EndPoint,value class System.Threading.CancellationToken)
+									[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..ctor(class System.Net.Sockets.Socket,bool)
+										[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs..ctor(bool)
+										[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs..ctor(bool)
+									[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..ctor(class System.Net.Sockets.Socket,bool)
+									[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.ConnectAsync(class System.Net.Sockets.Socket)
+										[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.Sockets.SocketAsyncEventArgs,bool,bool)
+											[start] system.net.sockets!System.Net.Sockets.Socket.ValidateForMultiConnect(bool)
+												[start] system.net.sockets!System.Net.Sockets.Socket.ReplaceHandleIfNecessaryAfterFailedConnect()
+												[ end ] system.net.sockets!System.Net.Sockets.Socket.ReplaceHandleIfNecessaryAfterFailedConnect()
+											[ end ] system.net.sockets!System.Net.Sockets.Socket.ValidateForMultiConnect(bool)
+											[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.StartOperationCommon(class System.Net.Sockets.Socket,value class System.Net.Sockets.SocketAsyncOperation)
+												[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+													[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+												[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+													[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+												[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+													[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+											[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.StartOperationCommon(class System.Net.Sockets.Socket,value class System.Net.Sockets.SocketAsyncOperation)
+											[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.DnsConnectAsync(class System.Net.DnsEndPoint,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+												[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.CopyBufferFrom(class System.Net.Sockets.SocketAsyncEventArgs)
+													[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.Complete()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.Complete()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.CopyBufferFrom(class System.Net.Sockets.SocketAsyncEventArgs)
+												[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.<DnsConnectAsync>g__Core|112_0(class MultiConnectSocketAsyncEventArgs,class System.Threading.Tasks.Task`1<class System.Net.IPAddress[]>,int32,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,value class System.Threading.CancellationToken)
+													[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs+<<DnsConnectAsync>g__Core|112_0>d.MoveNext()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs+<<DnsConnectAsync>g__Core|112_0>d.MoveNext()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.<DnsConnectAsync>g__Core|112_0(class MultiConnectSocketAsyncEventArgs,class System.Threading.Tasks.Task`1<class System.Net.IPAddress[]>,int32,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,value class System.Threading.CancellationToken)
+											[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.DnsConnectAsync(class System.Net.DnsEndPoint,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+										[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.Sockets.SocketAsyncEventArgs,bool,bool)
+									[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.ConnectAsync(class System.Net.Sockets.Socket)
+									[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.GetStatus(int16)
+										[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..cctor()
+											[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs+<>c..cctor()
+											[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs+<>c..cctor()
+										[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..cctor()
+									[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.GetStatus(int16)
+								[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.EndPoint,value class System.Threading.CancellationToken)
+							[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32,value class System.Threading.CancellationToken)
+							[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.OnCompleted(class System.Action`1<class System.Object>,class System.Object,int16,value class System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags)
+							[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.OnCompleted(class System.Action`1<class System.Object>,class System.Object,int16,value class System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags)
+						[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32)
+						[start] system.net.sockets!System.Threading.Tasks.TaskToApm.Begin(class System.Threading.Tasks.Task,class System.AsyncCallback,class System.Object)
+						[ end ] system.net.sockets!System.Threading.Tasks.TaskToApm.Begin(class System.Threading.Tasks.Task,class System.AsyncCallback,class System.Object)
+					[ end ] system.net.sockets!System.Net.Sockets.Socket.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+				[ end ] system.net.sockets!System.Net.Sockets.TcpClient.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+				[start] system.net.sockets!System.Threading.Tasks.TaskToApm+TaskAsyncResult.get_AsyncWaitHandle()
+				[ end ] system.net.sockets!System.Threading.Tasks.TaskToApm+TaskAsyncResult.get_AsyncWaitHandle()
+				[start] system.net.sockets!System.Net.Sockets.NetworkStream.Write(value class System.ReadOnlySpan`1<unsigned int8>)
+					[start] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags)
+						[start] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,value class System.Net.Sockets.SocketError&)
+							[start] system.net.sockets!System.Net.Sockets.SocketPal.Send(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32&)
+								[start] system.net.sockets!System.Net.Sockets.SocketAsyncContext.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32,int32&)
+									[start] system.net.sockets!System.Net.Sockets.SocketAsyncContext.SendTo(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32,int32&)
+										[start] system.net.sockets!System.Net.Sockets.SocketPal.TryCompleteSendTo(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,class System.Collections.Generic.IList`1<value class System.ArraySegment`1<unsigned int8>>,int32&,int32&,int32&,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32&,value class System.Net.Sockets.SocketError&)
+										[ end ] system.net.sockets!System.Net.Sockets.SocketPal.TryCompleteSendTo(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,class System.Collections.Generic.IList`1<value class System.ArraySegment`1<unsigned int8>>,int32&,int32&,int32&,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32&,value class System.Net.Sockets.SocketError&)
+									[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncContext.SendTo(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32,int32&)
+								[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncContext.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32,int32&)
+							[ end ] system.net.sockets!System.Net.Sockets.SocketPal.Send(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32&)
+						[ end ] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,value class System.Net.Sockets.SocketError&)
+					[ end ] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags)
+				[ end ] system.net.sockets!System.Net.Sockets.NetworkStream.Write(value class System.ReadOnlySpan`1<unsigned int8>)
+			[ end ] sockets!Program+<<Main>$>d__0.MoveNext()
+		[ end ] sockets!Program.<Main>$(class System.String[])
+	[ end ] sockets!Program.<Main>(class System.String[])
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..f8f29e7dd
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/SystemArrayPooling.gold
@@ -0,0 +1,2 @@
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/TaskTestProject1.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/TaskTestProject1.gold
new file mode 100644
index 000000000..c8e5cb4db
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/TaskTestProject1.gold
@@ -0,0 +1,4 @@
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/UnsafeFixed.gold b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/UnsafeFixed.gold
new file mode 100644
index 000000000..46ad3a5cf
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/MethodsStartEndTests/net9.0/UnsafeFixed.gold
@@ -0,0 +1,2 @@
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/linux/OcelEventsTest/net10.0/SimpleTest.gold b/Procfiler/test_data/gold/linux/OcelEventsTest/SimpleTest.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/OcelEventsTest/net10.0/SimpleTest.gold
rename to Procfiler/test_data/gold/linux/OcelEventsTest/SimpleTest.gold
diff --git a/Procfiler/test_data/gold/linux/OcelEventsTest/net10.0/SimpleTest2.gold b/Procfiler/test_data/gold/linux/OcelEventsTest/SimpleTest2.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/OcelEventsTest/net10.0/SimpleTest2.gold
rename to Procfiler/test_data/gold/linux/OcelEventsTest/SimpleTest2.gold
diff --git a/Procfiler/test_data/gold/linux/OcelEventsTest/net10.0/SimpleTest3.gold b/Procfiler/test_data/gold/linux/OcelEventsTest/SimpleTest3.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/OcelEventsTest/net10.0/SimpleTest3.gold
rename to Procfiler/test_data/gold/linux/OcelEventsTest/SimpleTest3.gold
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwait.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwait.gold
new file mode 100644
index 000000000..e6eac41e3
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwait.gold
@@ -0,0 +1,236 @@
+AsyncAwait.Program+<Main>d__0
+Trace:
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method1>d__1
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method2>d__2
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method3>d__3
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwaitTaskFactoryNew.gold
new file mode 100644
index 000000000..f40a8ac9b
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwaitTaskFactoryNew.gold
@@ -0,0 +1,30 @@
+AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+			[start] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+
+
+AsyncAwaitTaskFactoryNew.Program+<Main>d__0
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+			[start] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AsyncDisposable.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AsyncDisposable.gold
new file mode 100644
index 000000000..75ebfebd3
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AsyncDisposable.gold
@@ -0,0 +1,68 @@
+AsyncDisposable.Program+<Main>d__0
+Trace:
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+				[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+AsyncDisposable.Program+<Method1>d__1
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0
+Trace:
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AwaitForeach.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AwaitForeach.gold
new file mode 100644
index 000000000..ac4eed873
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/AwaitForeach.gold
@@ -0,0 +1,286 @@
+AwaitForeach.Program+<Allocate>d__2
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+
+AwaitForeach.Program+<EnumerateAsync>d__1
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+
+AwaitForeach.Program+<Main>d__0
+Trace:
+	[start] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+		[ end ] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/NotSimpleAsyncAwait.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/NotSimpleAsyncAwait.gold
new file mode 100644
index 000000000..de0eb5e5d
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/NotSimpleAsyncAwait.gold
@@ -0,0 +1,280 @@
+NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+
+NotSimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/SimpleAsyncAwait.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/SimpleAsyncAwait.gold
new file mode 100644
index 000000000..63c0fc58d
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net8.0/SimpleAsyncAwait.gold
@@ -0,0 +1,36 @@
+SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d
+Trace:
+	[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+	[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+
+
+SimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+			[start] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+		[start] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+			[start] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+			[start] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+		[start] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+		[start] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+			[start] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwait.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwait.gold
new file mode 100644
index 000000000..e6eac41e3
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwait.gold
@@ -0,0 +1,236 @@
+AsyncAwait.Program+<Main>d__0
+Trace:
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method1>d__1
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method2>d__2
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method3>d__3
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwaitTaskFactoryNew.gold
new file mode 100644
index 000000000..f40a8ac9b
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwaitTaskFactoryNew.gold
@@ -0,0 +1,30 @@
+AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+			[start] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+
+
+AsyncAwaitTaskFactoryNew.Program+<Main>d__0
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+			[start] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AsyncDisposable.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AsyncDisposable.gold
new file mode 100644
index 000000000..75ebfebd3
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AsyncDisposable.gold
@@ -0,0 +1,68 @@
+AsyncDisposable.Program+<Main>d__0
+Trace:
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+				[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+AsyncDisposable.Program+<Method1>d__1
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0
+Trace:
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AwaitForeach.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AwaitForeach.gold
new file mode 100644
index 000000000..ac4eed873
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/AwaitForeach.gold
@@ -0,0 +1,286 @@
+AwaitForeach.Program+<Allocate>d__2
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+
+AwaitForeach.Program+<EnumerateAsync>d__1
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+
+AwaitForeach.Program+<Main>d__0
+Trace:
+	[start] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+		[ end ] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/NotSimpleAsyncAwait.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/NotSimpleAsyncAwait.gold
new file mode 100644
index 000000000..de0eb5e5d
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/NotSimpleAsyncAwait.gold
@@ -0,0 +1,280 @@
+NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+
+NotSimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/SimpleAsyncAwait.gold b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/SimpleAsyncAwait.gold
new file mode 100644
index 000000000..63c0fc58d
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/OnlineAsyncMethodsGroupingTests/net9.0/SimpleAsyncAwait.gold
@@ -0,0 +1,36 @@
+SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d
+Trace:
+	[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+	[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+
+
+SimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+			[start] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+		[start] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+			[start] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+			[start] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+		[start] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+		[start] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+			[start] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold
new file mode 100644
index 000000000..7178bff37
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold
@@ -0,0 +1,236 @@
+ASYNC_AsyncAwait.Program+<Main>d__0
+Trace:
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method1>d__1
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method2>d__2
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method3>d__3
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold
new file mode 100644
index 000000000..76edaf195
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold
@@ -0,0 +1,30 @@
+ASYNC_AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+			[start] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwaitTaskFactoryNew.Program+<Main>d__0
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+			[start] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold
new file mode 100644
index 000000000..65c86d99d
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold
@@ -0,0 +1,68 @@
+ASYNC_AsyncDisposable.Program+<Main>d__0
+Trace:
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+				[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncDisposable.Program+<Method1>d__1
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0
+Trace:
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold
new file mode 100644
index 000000000..5507003cc
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold
@@ -0,0 +1,286 @@
+ASYNC_AwaitForeach.Program+<Allocate>d__2
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+
+ASYNC_AwaitForeach.Program+<EnumerateAsync>d__1
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AwaitForeach.Program+<Main>d__0
+Trace:
+	[start] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+		[ end ] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold
new file mode 100644
index 000000000..a366446ba
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold
@@ -0,0 +1,280 @@
+ASYNC_NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+
+ASYNC_NotSimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold
new file mode 100644
index 000000000..e8d7db06a
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold
@@ -0,0 +1,36 @@
+ASYNC_SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d
+Trace:
+	[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+	[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+
+
+ASYNC_SimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+			[start] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+		[start] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+			[start] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+			[start] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+		[start] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+		[start] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+			[start] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold
new file mode 100644
index 000000000..7178bff37
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold
@@ -0,0 +1,236 @@
+ASYNC_AsyncAwait.Program+<Main>d__0
+Trace:
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method1>d__1
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method2>d__2
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method3>d__3
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold
new file mode 100644
index 000000000..76edaf195
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold
@@ -0,0 +1,30 @@
+ASYNC_AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+			[start] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwaitTaskFactoryNew.Program+<Main>d__0
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+			[start] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold
new file mode 100644
index 000000000..65c86d99d
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold
@@ -0,0 +1,68 @@
+ASYNC_AsyncDisposable.Program+<Main>d__0
+Trace:
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+				[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncDisposable.Program+<Method1>d__1
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0
+Trace:
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold
new file mode 100644
index 000000000..5507003cc
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold
@@ -0,0 +1,286 @@
+ASYNC_AwaitForeach.Program+<Allocate>d__2
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+
+ASYNC_AwaitForeach.Program+<EnumerateAsync>d__1
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AwaitForeach.Program+<Main>d__0
+Trace:
+	[start] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+		[ end ] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold
new file mode 100644
index 000000000..a366446ba
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold
@@ -0,0 +1,280 @@
+ASYNC_NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+
+ASYNC_NotSimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold
new file mode 100644
index 000000000..e8d7db06a
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold
@@ -0,0 +1,36 @@
+ASYNC_SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d
+Trace:
+	[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+	[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+
+
+ASYNC_SimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+			[start] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+		[start] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+			[start] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+			[start] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+		[start] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+		[start] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+			[start] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/ConsoleApp1.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/ConsoleApp1.gold
new file mode 100644
index 000000000..93a2b1d29
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/ConsoleApp1.gold
@@ -0,0 +1,41 @@
+Method: ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+Trace 1
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Method: ConsoleApp1.Program.Main[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+Method: ConsoleApp1.Program.Method1[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+Method: ConsoleApp1.Program.Method2[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..c0319364a
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..5cc114007
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..07bd7bf20
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,22 @@
+Method: ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Method: ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Method: ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..ec77375cb
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,14 @@
+Method: ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Method: ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/FileWriteProject.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/FileWriteProject.gold
new file mode 100644
index 000000000..c1e99db14
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/FileWriteProject.gold
@@ -0,0 +1,34 @@
+Method: FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Method: FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Method: FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Method: FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/FinalizableObject.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/FinalizableObject.gold
new file mode 100644
index 000000000..c577c2f5b
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/FinalizableObject.gold
@@ -0,0 +1,259 @@
+Method: FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace 0
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 1
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 2
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 3
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 4
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 5
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 6
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 7
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 8
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 9
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 10
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 11
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 12
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 13
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 14
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 15
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 16
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 17
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 18
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 19
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 20
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 21
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 22
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 23
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 24
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 25
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 26
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 27
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 28
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 29
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 30
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 31
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 32
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 33
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 34
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 35
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 36
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 37
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 38
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 39
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 40
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 41
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 42
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 43
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 44
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 45
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 46
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 47
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 48
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 49
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Method: FinalizableObject.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..7f83655d3
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+Method: IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/LOHAllocations.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/LOHAllocations.gold
new file mode 100644
index 000000000..404678d94
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+Method: LOHAllocations.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..9f8f8ac7a
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,40 @@
+Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..4d58a3f5c
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+Method: SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/TaskTestProject1.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/TaskTestProject1.gold
new file mode 100644
index 000000000..187509991
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/TaskTestProject1.gold
@@ -0,0 +1,14 @@
+Method: TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Method: TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+Trace 0
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/UnsafeFixed.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/UnsafeFixed.gold
new file mode 100644
index 000000000..2f0b0664f
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net8.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+Method: UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/ConsoleApp1.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/ConsoleApp1.gold
new file mode 100644
index 000000000..93a2b1d29
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/ConsoleApp1.gold
@@ -0,0 +1,41 @@
+Method: ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+Trace 1
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Method: ConsoleApp1.Program.Main[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+Method: ConsoleApp1.Program.Method1[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+Method: ConsoleApp1.Program.Method2[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..c0319364a
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..5cc114007
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..07bd7bf20
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,22 @@
+Method: ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Method: ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Method: ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..ec77375cb
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,14 @@
+Method: ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Method: ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/FileWriteProject.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/FileWriteProject.gold
new file mode 100644
index 000000000..c1e99db14
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/FileWriteProject.gold
@@ -0,0 +1,34 @@
+Method: FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Method: FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Method: FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Method: FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/FinalizableObject.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/FinalizableObject.gold
new file mode 100644
index 000000000..c577c2f5b
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/FinalizableObject.gold
@@ -0,0 +1,259 @@
+Method: FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace 0
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 1
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 2
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 3
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 4
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 5
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 6
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 7
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 8
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 9
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 10
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 11
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 12
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 13
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 14
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 15
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 16
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 17
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 18
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 19
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 20
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 21
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 22
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 23
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 24
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 25
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 26
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 27
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 28
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 29
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 30
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 31
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 32
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 33
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 34
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 35
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 36
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 37
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 38
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 39
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 40
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 41
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 42
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 43
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 44
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 45
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 46
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 47
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 48
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 49
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Method: FinalizableObject.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..7f83655d3
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+Method: IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/LOHAllocations.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/LOHAllocations.gold
new file mode 100644
index 000000000..404678d94
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+Method: LOHAllocations.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..9f8f8ac7a
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,40 @@
+Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..4d58a3f5c
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+Method: SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/TaskTestProject1.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/TaskTestProject1.gold
new file mode 100644
index 000000000..187509991
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/TaskTestProject1.gold
@@ -0,0 +1,14 @@
+Method: TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Method: TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+Trace 0
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/UnsafeFixed.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/UnsafeFixed.gold
new file mode 100644
index 000000000..2f0b0664f
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTests/net9.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+Method: UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/ConsoleApp1.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/ConsoleApp1.gold
new file mode 100644
index 000000000..568b71ad9
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/ConsoleApp1.gold
@@ -0,0 +1,31 @@
+Method: ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+Trace 1
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Method: ConsoleApp1.Program.Main[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Main[void..()]
+	[exec]ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+Method: ConsoleApp1.Program.Method1[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method1[void..()]
+	[exec]ConsoleApp1.Program..ctor[instance.void..()]
+	[exec]ConsoleApp1.Program.Method2[void..()]
+	[exec]ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+Method: ConsoleApp1.Program.Method2[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..c0319364a
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..5cc114007
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..a133519e8
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,20 @@
+Method: ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Method: ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Method: ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+	[exec]ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[exec]ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..e5b82c86c
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,13 @@
+Method: ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Method: ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+	[exec]ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/FileWriteProject.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/FileWriteProject.gold
new file mode 100644
index 000000000..439404490
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/FileWriteProject.gold
@@ -0,0 +1,26 @@
+Method: FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+	[exec]FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Method: FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[exec]FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Method: FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Method: FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/FinalizableObject.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/FinalizableObject.gold
new file mode 100644
index 000000000..99f103fb9
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/FinalizableObject.gold
@@ -0,0 +1,209 @@
+Method: FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace 0
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 1
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 2
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 3
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 4
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 5
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 6
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 7
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 8
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 9
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 10
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 11
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 12
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 13
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 14
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 15
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 16
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 17
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 18
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 19
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 20
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 21
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 22
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 23
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 24
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 25
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 26
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 27
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 28
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 29
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 30
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 31
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 32
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 33
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 34
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 35
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 36
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 37
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 38
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 39
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 40
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 41
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 42
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 43
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 44
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 45
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 46
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 47
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 48
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 49
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Method: FinalizableObject.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..7f83655d3
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+Method: IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/LOHAllocations.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/LOHAllocations.gold
new file mode 100644
index 000000000..404678d94
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+Method: LOHAllocations.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..b4ed29bf1
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,31 @@
+Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+	[exec]NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..4d58a3f5c
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+Method: SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/TaskTestProject1.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/TaskTestProject1.gold
new file mode 100644
index 000000000..419e89a13
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/TaskTestProject1.gold
@@ -0,0 +1,13 @@
+Method: TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+	[exec]TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Method: TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+Trace 0
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/UnsafeFixed.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/UnsafeFixed.gold
new file mode 100644
index 000000000..2f0b0664f
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+Method: UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/ConsoleApp1.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/ConsoleApp1.gold
new file mode 100644
index 000000000..568b71ad9
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/ConsoleApp1.gold
@@ -0,0 +1,31 @@
+Method: ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+Trace 1
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Method: ConsoleApp1.Program.Main[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Main[void..()]
+	[exec]ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+Method: ConsoleApp1.Program.Method1[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method1[void..()]
+	[exec]ConsoleApp1.Program..ctor[instance.void..()]
+	[exec]ConsoleApp1.Program.Method2[void..()]
+	[exec]ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+Method: ConsoleApp1.Program.Method2[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..c0319364a
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..5cc114007
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..a133519e8
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,20 @@
+Method: ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Method: ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Method: ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+	[exec]ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[exec]ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..e5b82c86c
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,13 @@
+Method: ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Method: ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+	[exec]ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/FileWriteProject.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/FileWriteProject.gold
new file mode 100644
index 000000000..439404490
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/FileWriteProject.gold
@@ -0,0 +1,26 @@
+Method: FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+	[exec]FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Method: FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[exec]FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Method: FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Method: FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/FinalizableObject.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/FinalizableObject.gold
new file mode 100644
index 000000000..99f103fb9
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/FinalizableObject.gold
@@ -0,0 +1,209 @@
+Method: FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace 0
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 1
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 2
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 3
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 4
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 5
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 6
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 7
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 8
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 9
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 10
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 11
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 12
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 13
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 14
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 15
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 16
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 17
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 18
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 19
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 20
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 21
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 22
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 23
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 24
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 25
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 26
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 27
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 28
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 29
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 30
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 31
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 32
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 33
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 34
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 35
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 36
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 37
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 38
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 39
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 40
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 41
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 42
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 43
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 44
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 45
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 46
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 47
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 48
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 49
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Method: FinalizableObject.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..7f83655d3
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+Method: IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/LOHAllocations.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/LOHAllocations.gold
new file mode 100644
index 000000000..404678d94
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+Method: LOHAllocations.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..b4ed29bf1
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,31 @@
+Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+	[exec]NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..4d58a3f5c
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+Method: SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/TaskTestProject1.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/TaskTestProject1.gold
new file mode 100644
index 000000000..419e89a13
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/TaskTestProject1.gold
@@ -0,0 +1,13 @@
+Method: TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+	[exec]TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Method: TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+Trace 0
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/UnsafeFixed.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/UnsafeFixed.gold
new file mode 100644
index 000000000..2f0b0664f
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+Method: UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/ConsoleApp1.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/ConsoleApp1.gold
new file mode 100644
index 000000000..ef7620b97
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/ConsoleApp1.gold
@@ -0,0 +1,42 @@
+ConsoleApp1.Program..ctor[instance.void..()]
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+
+ConsoleApp1.Program.Main[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+
+ConsoleApp1.Program.Method1[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+
+ConsoleApp1.Program.Method2[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..fb60809b4
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..8694b6435
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..ccbf81c23
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,22 @@
+ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+Trace:
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+
+ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+Trace:
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+
+ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..cffb8cdce
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,14 @@
+ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+Trace:
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+
+ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/FileWriteProject.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/FileWriteProject.gold
new file mode 100644
index 000000000..aacd69ad4
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/FileWriteProject.gold
@@ -0,0 +1,34 @@
+FileWriteProject.Program.<Main>[void..(class.System.String[])]
+Trace:
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+
+FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+Trace:
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+
+FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+Trace:
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+
+FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+Trace:
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/FinalizableObject.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/FinalizableObject.gold
new file mode 100644
index 000000000..5ea326df0
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/FinalizableObject.gold
@@ -0,0 +1,506 @@
+FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+
+FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+
+FinalizableObject.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..f7d4f346b
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/LOHAllocations.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/LOHAllocations.gold
new file mode 100644
index 000000000..8319d613d
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+LOHAllocations.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..1642ba204
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,40 @@
+NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+
+NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+
+NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+
+NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+
+NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..ccd2759aa
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+SystemArrayPooling.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/TaskTestProject1.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/TaskTestProject1.gold
new file mode 100644
index 000000000..6687c221f
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/TaskTestProject1.gold
@@ -0,0 +1,26 @@
+TaskTestProject1.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/UnsafeFixed.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/UnsafeFixed.gold
new file mode 100644
index 000000000..cc637a95b
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net8.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+UnsafeFixed.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/ConsoleApp1.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/ConsoleApp1.gold
new file mode 100644
index 000000000..ef7620b97
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/ConsoleApp1.gold
@@ -0,0 +1,42 @@
+ConsoleApp1.Program..ctor[instance.void..()]
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+
+ConsoleApp1.Program.Main[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+
+ConsoleApp1.Program.Method1[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+
+ConsoleApp1.Program.Method2[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..fb60809b4
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..8694b6435
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..ccbf81c23
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,22 @@
+ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+Trace:
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+
+ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+Trace:
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+
+ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..cffb8cdce
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,14 @@
+ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+Trace:
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+
+ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/FileWriteProject.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/FileWriteProject.gold
new file mode 100644
index 000000000..aacd69ad4
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/FileWriteProject.gold
@@ -0,0 +1,34 @@
+FileWriteProject.Program.<Main>[void..(class.System.String[])]
+Trace:
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+
+FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+Trace:
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+
+FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+Trace:
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+
+FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+Trace:
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/FinalizableObject.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/FinalizableObject.gold
new file mode 100644
index 000000000..5ea326df0
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/FinalizableObject.gold
@@ -0,0 +1,506 @@
+FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+
+FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+
+FinalizableObject.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..f7d4f346b
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/LOHAllocations.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/LOHAllocations.gold
new file mode 100644
index 000000000..8319d613d
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+LOHAllocations.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..1642ba204
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,40 @@
+NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+
+NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+
+NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+
+NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+
+NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..ccd2759aa
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+SystemArrayPooling.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/TaskTestProject1.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/TaskTestProject1.gold
new file mode 100644
index 000000000..6687c221f
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/TaskTestProject1.gold
@@ -0,0 +1,26 @@
+TaskTestProject1.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+
+
diff --git a/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/UnsafeFixed.gold b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/UnsafeFixed.gold
new file mode 100644
index 000000000..cc637a95b
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/CompletedMethodsExecutionsTests/net9.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+UnsafeFixed.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/ConsoleApp1.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/ConsoleApp1.gold
new file mode 100644
index 000000000..465b6e7d7
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/ConsoleApp1.gold
@@ -0,0 +1,10 @@
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..aab87f6c1
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,2 @@
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..9695d47e2
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,2 @@
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..a044449c0
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,6 @@
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..8983b0e1c
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,4 @@
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/FileWriteProject.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/FileWriteProject.gold
new file mode 100644
index 000000000..7677af6a3
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/FileWriteProject.gold
@@ -0,0 +1,8 @@
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/FinalizableObject.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/FinalizableObject.gold
new file mode 100644
index 000000000..e17b1820d
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/FinalizableObject.gold
@@ -0,0 +1,102 @@
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..9ed884af8
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,2 @@
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/LOHAllocations.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/LOHAllocations.gold
new file mode 100644
index 000000000..bce4efdf1
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/LOHAllocations.gold
@@ -0,0 +1,2 @@
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..953d09e03
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,10 @@
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/Sockets.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/Sockets.gold
new file mode 100644
index 000000000..0978b0fcc
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/Sockets.gold
@@ -0,0 +1,120 @@
+	[start] sockets!Program.<Main>(class System.String[])
+		[start] sockets!Program.<Main>$(class System.String[])
+			[start] sockets!Program+<<Main>$>d__0.MoveNext()
+				[start] system.net.sockets!System.Net.Sockets.TcpClient..ctor()
+					[start] system.net.sockets!System.Net.Sockets.TcpClient..ctor(value class System.Net.Sockets.AddressFamily)
+						[start] system.net.sockets!System.Net.NetEventSource..cctor()
+							[start] system.net.sockets!System.Net.NetEventSource..ctor()
+							[ end ] system.net.sockets!System.Net.NetEventSource..ctor()
+						[ end ] system.net.sockets!System.Net.NetEventSource..cctor()
+						[start] system.net.sockets!System.Net.NetEventSource..cctor()
+							[start] system.net.sockets!System.Net.NetEventSource..ctor()
+							[ end ] system.net.sockets!System.Net.NetEventSource..ctor()
+						[ end ] system.net.sockets!System.Net.NetEventSource..cctor()
+						[start] system.net.sockets!System.Net.Sockets.TcpClient.InitializeClientSocket()
+							[start] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+								[start] system.net.sockets!System.Net.Sockets.Socket.get_OSSupportsIPv6()
+									[start] system.net.sockets!System.Net.SocketProtocolSupportPal.get_OSSupportsIPv6()
+										[start] system.net.sockets!System.Net.SocketProtocolSupportPal..cctor()
+											[start] system.net.sockets!System.Net.SocketProtocolSupportPal.IsSupported(value class System.Net.Sockets.AddressFamily)
+											[ end ] system.net.sockets!System.Net.SocketProtocolSupportPal.IsSupported(value class System.Net.Sockets.AddressFamily)
+										[ end ] system.net.sockets!System.Net.SocketProtocolSupportPal..cctor()
+									[ end ] system.net.sockets!System.Net.SocketProtocolSupportPal.get_OSSupportsIPv6()
+								[ end ] system.net.sockets!System.Net.Sockets.Socket.get_OSSupportsIPv6()
+								[start] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+									[start] system.net.sockets!System.Net.Sockets.SocketPal.CreateSocket(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,class System.Net.Sockets.SafeSocketHandle&)
+									[ end ] system.net.sockets!System.Net.Sockets.SocketPal.CreateSocket(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,class System.Net.Sockets.SafeSocketHandle&)
+								[ end ] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+								[start] system.net.sockets!System.Net.Sockets.Socket.set_DualMode(bool)
+									[start] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+										[start] system.net.sockets!System.Net.Sockets.Socket.ThrowIfDisposed()
+										[ end ] system.net.sockets!System.Net.Sockets.Socket.ThrowIfDisposed()
+										[start] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32,bool)
+											[start] system.net.sockets!System.Net.Sockets.SocketPal.SetSockOpt(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+												[start] system.net.sockets!System.Net.Sockets.SocketPal.GetErrorAndTrackSetting(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,value class Error)
+												[ end ] system.net.sockets!System.Net.Sockets.SocketPal.GetErrorAndTrackSetting(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,value class Error)
+											[ end ] system.net.sockets!System.Net.Sockets.SocketPal.SetSockOpt(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+										[ end ] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32,bool)
+									[ end ] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+								[ end ] system.net.sockets!System.Net.Sockets.Socket.set_DualMode(bool)
+							[ end ] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+						[ end ] system.net.sockets!System.Net.Sockets.TcpClient.InitializeClientSocket()
+					[ end ] system.net.sockets!System.Net.Sockets.TcpClient..ctor(value class System.Net.Sockets.AddressFamily)
+				[ end ] system.net.sockets!System.Net.Sockets.TcpClient..ctor()
+				[start] system.net.sockets!System.Net.Sockets.TcpClient.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+					[start] system.net.sockets!System.Net.Sockets.TcpClient.get_Client()
+					[ end ] system.net.sockets!System.Net.Sockets.TcpClient.get_Client()
+					[start] system.net.sockets!System.Net.Sockets.Socket.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+						[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32)
+							[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32,value class System.Threading.CancellationToken)
+								[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.EndPoint,value class System.Threading.CancellationToken)
+									[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..ctor(class System.Net.Sockets.Socket,bool)
+										[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs..ctor(bool)
+										[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs..ctor(bool)
+									[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..ctor(class System.Net.Sockets.Socket,bool)
+									[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.ConnectAsync(class System.Net.Sockets.Socket)
+										[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.Sockets.SocketAsyncEventArgs,bool,bool)
+											[start] system.net.sockets!System.Net.Sockets.Socket.ValidateForMultiConnect(bool)
+												[start] system.net.sockets!System.Net.Sockets.Socket.ReplaceHandleIfNecessaryAfterFailedConnect()
+												[ end ] system.net.sockets!System.Net.Sockets.Socket.ReplaceHandleIfNecessaryAfterFailedConnect()
+											[ end ] system.net.sockets!System.Net.Sockets.Socket.ValidateForMultiConnect(bool)
+											[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.StartOperationCommon(class System.Net.Sockets.Socket,value class System.Net.Sockets.SocketAsyncOperation)
+												[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+													[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+												[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+													[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+												[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+													[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+											[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.StartOperationCommon(class System.Net.Sockets.Socket,value class System.Net.Sockets.SocketAsyncOperation)
+											[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.DnsConnectAsync(class System.Net.DnsEndPoint,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+												[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.CopyBufferFrom(class System.Net.Sockets.SocketAsyncEventArgs)
+													[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.Complete()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.Complete()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.CopyBufferFrom(class System.Net.Sockets.SocketAsyncEventArgs)
+												[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.<DnsConnectAsync>g__Core|112_0(class MultiConnectSocketAsyncEventArgs,class System.Threading.Tasks.Task`1<class System.Net.IPAddress[]>,int32,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,value class System.Threading.CancellationToken)
+													[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs+<<DnsConnectAsync>g__Core|112_0>d.MoveNext()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs+<<DnsConnectAsync>g__Core|112_0>d.MoveNext()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.<DnsConnectAsync>g__Core|112_0(class MultiConnectSocketAsyncEventArgs,class System.Threading.Tasks.Task`1<class System.Net.IPAddress[]>,int32,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,value class System.Threading.CancellationToken)
+											[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.DnsConnectAsync(class System.Net.DnsEndPoint,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+										[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.Sockets.SocketAsyncEventArgs,bool,bool)
+									[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.ConnectAsync(class System.Net.Sockets.Socket)
+									[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.GetStatus(int16)
+										[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..cctor()
+											[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs+<>c..cctor()
+											[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs+<>c..cctor()
+										[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..cctor()
+									[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.GetStatus(int16)
+								[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.EndPoint,value class System.Threading.CancellationToken)
+							[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32,value class System.Threading.CancellationToken)
+							[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.OnCompleted(class System.Action`1<class System.Object>,class System.Object,int16,value class System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags)
+							[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.OnCompleted(class System.Action`1<class System.Object>,class System.Object,int16,value class System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags)
+						[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32)
+						[start] system.net.sockets!System.Threading.Tasks.TaskToApm.Begin(class System.Threading.Tasks.Task,class System.AsyncCallback,class System.Object)
+						[ end ] system.net.sockets!System.Threading.Tasks.TaskToApm.Begin(class System.Threading.Tasks.Task,class System.AsyncCallback,class System.Object)
+					[ end ] system.net.sockets!System.Net.Sockets.Socket.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+				[ end ] system.net.sockets!System.Net.Sockets.TcpClient.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+				[start] system.net.sockets!System.Threading.Tasks.TaskToApm+TaskAsyncResult.get_AsyncWaitHandle()
+				[ end ] system.net.sockets!System.Threading.Tasks.TaskToApm+TaskAsyncResult.get_AsyncWaitHandle()
+				[start] system.net.sockets!System.Net.Sockets.NetworkStream.Write(value class System.ReadOnlySpan`1<unsigned int8>)
+					[start] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags)
+						[start] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,value class System.Net.Sockets.SocketError&)
+							[start] system.net.sockets!System.Net.Sockets.SocketPal.Send(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32&)
+								[start] system.net.sockets!System.Net.Sockets.SocketAsyncContext.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32,int32&)
+									[start] system.net.sockets!System.Net.Sockets.SocketAsyncContext.SendTo(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32,int32&)
+										[start] system.net.sockets!System.Net.Sockets.SocketPal.TryCompleteSendTo(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,class System.Collections.Generic.IList`1<value class System.ArraySegment`1<unsigned int8>>,int32&,int32&,int32&,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32&,value class System.Net.Sockets.SocketError&)
+										[ end ] system.net.sockets!System.Net.Sockets.SocketPal.TryCompleteSendTo(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,class System.Collections.Generic.IList`1<value class System.ArraySegment`1<unsigned int8>>,int32&,int32&,int32&,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32&,value class System.Net.Sockets.SocketError&)
+									[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncContext.SendTo(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32,int32&)
+								[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncContext.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32,int32&)
+							[ end ] system.net.sockets!System.Net.Sockets.SocketPal.Send(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32&)
+						[ end ] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,value class System.Net.Sockets.SocketError&)
+					[ end ] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags)
+				[ end ] system.net.sockets!System.Net.Sockets.NetworkStream.Write(value class System.ReadOnlySpan`1<unsigned int8>)
+			[ end ] sockets!Program+<<Main>$>d__0.MoveNext()
+		[ end ] sockets!Program.<Main>$(class System.String[])
+	[ end ] sockets!Program.<Main>(class System.String[])
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..f8f29e7dd
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/SystemArrayPooling.gold
@@ -0,0 +1,2 @@
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/TaskTestProject1.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/TaskTestProject1.gold
new file mode 100644
index 000000000..c8e5cb4db
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/TaskTestProject1.gold
@@ -0,0 +1,4 @@
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/UnsafeFixed.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/UnsafeFixed.gold
new file mode 100644
index 000000000..46ad3a5cf
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net8.0/UnsafeFixed.gold
@@ -0,0 +1,2 @@
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/ConsoleApp1.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/ConsoleApp1.gold
new file mode 100644
index 000000000..465b6e7d7
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/ConsoleApp1.gold
@@ -0,0 +1,10 @@
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..aab87f6c1
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,2 @@
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..9695d47e2
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,2 @@
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..a044449c0
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,6 @@
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..8983b0e1c
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,4 @@
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/FileWriteProject.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/FileWriteProject.gold
new file mode 100644
index 000000000..7677af6a3
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/FileWriteProject.gold
@@ -0,0 +1,8 @@
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/FinalizableObject.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/FinalizableObject.gold
new file mode 100644
index 000000000..e17b1820d
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/FinalizableObject.gold
@@ -0,0 +1,102 @@
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..9ed884af8
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,2 @@
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/LOHAllocations.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/LOHAllocations.gold
new file mode 100644
index 000000000..bce4efdf1
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/LOHAllocations.gold
@@ -0,0 +1,2 @@
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..953d09e03
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,10 @@
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/Sockets.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/Sockets.gold
new file mode 100644
index 000000000..0978b0fcc
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/Sockets.gold
@@ -0,0 +1,120 @@
+	[start] sockets!Program.<Main>(class System.String[])
+		[start] sockets!Program.<Main>$(class System.String[])
+			[start] sockets!Program+<<Main>$>d__0.MoveNext()
+				[start] system.net.sockets!System.Net.Sockets.TcpClient..ctor()
+					[start] system.net.sockets!System.Net.Sockets.TcpClient..ctor(value class System.Net.Sockets.AddressFamily)
+						[start] system.net.sockets!System.Net.NetEventSource..cctor()
+							[start] system.net.sockets!System.Net.NetEventSource..ctor()
+							[ end ] system.net.sockets!System.Net.NetEventSource..ctor()
+						[ end ] system.net.sockets!System.Net.NetEventSource..cctor()
+						[start] system.net.sockets!System.Net.NetEventSource..cctor()
+							[start] system.net.sockets!System.Net.NetEventSource..ctor()
+							[ end ] system.net.sockets!System.Net.NetEventSource..ctor()
+						[ end ] system.net.sockets!System.Net.NetEventSource..cctor()
+						[start] system.net.sockets!System.Net.Sockets.TcpClient.InitializeClientSocket()
+							[start] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+								[start] system.net.sockets!System.Net.Sockets.Socket.get_OSSupportsIPv6()
+									[start] system.net.sockets!System.Net.SocketProtocolSupportPal.get_OSSupportsIPv6()
+										[start] system.net.sockets!System.Net.SocketProtocolSupportPal..cctor()
+											[start] system.net.sockets!System.Net.SocketProtocolSupportPal.IsSupported(value class System.Net.Sockets.AddressFamily)
+											[ end ] system.net.sockets!System.Net.SocketProtocolSupportPal.IsSupported(value class System.Net.Sockets.AddressFamily)
+										[ end ] system.net.sockets!System.Net.SocketProtocolSupportPal..cctor()
+									[ end ] system.net.sockets!System.Net.SocketProtocolSupportPal.get_OSSupportsIPv6()
+								[ end ] system.net.sockets!System.Net.Sockets.Socket.get_OSSupportsIPv6()
+								[start] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+									[start] system.net.sockets!System.Net.Sockets.SocketPal.CreateSocket(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,class System.Net.Sockets.SafeSocketHandle&)
+									[ end ] system.net.sockets!System.Net.Sockets.SocketPal.CreateSocket(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,class System.Net.Sockets.SafeSocketHandle&)
+								[ end ] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.AddressFamily,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+								[start] system.net.sockets!System.Net.Sockets.Socket.set_DualMode(bool)
+									[start] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+										[start] system.net.sockets!System.Net.Sockets.Socket.ThrowIfDisposed()
+										[ end ] system.net.sockets!System.Net.Sockets.Socket.ThrowIfDisposed()
+										[start] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32,bool)
+											[start] system.net.sockets!System.Net.Sockets.SocketPal.SetSockOpt(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+												[start] system.net.sockets!System.Net.Sockets.SocketPal.GetErrorAndTrackSetting(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,value class Error)
+												[ end ] system.net.sockets!System.Net.Sockets.SocketPal.GetErrorAndTrackSetting(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,value class Error)
+											[ end ] system.net.sockets!System.Net.Sockets.SocketPal.SetSockOpt(class System.Net.Sockets.SafeSocketHandle,value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+										[ end ] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32,bool)
+									[ end ] system.net.sockets!System.Net.Sockets.Socket.SetSocketOption(value class System.Net.Sockets.SocketOptionLevel,value class System.Net.Sockets.SocketOptionName,int32)
+								[ end ] system.net.sockets!System.Net.Sockets.Socket.set_DualMode(bool)
+							[ end ] system.net.sockets!System.Net.Sockets.Socket..ctor(value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+						[ end ] system.net.sockets!System.Net.Sockets.TcpClient.InitializeClientSocket()
+					[ end ] system.net.sockets!System.Net.Sockets.TcpClient..ctor(value class System.Net.Sockets.AddressFamily)
+				[ end ] system.net.sockets!System.Net.Sockets.TcpClient..ctor()
+				[start] system.net.sockets!System.Net.Sockets.TcpClient.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+					[start] system.net.sockets!System.Net.Sockets.TcpClient.get_Client()
+					[ end ] system.net.sockets!System.Net.Sockets.TcpClient.get_Client()
+					[start] system.net.sockets!System.Net.Sockets.Socket.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+						[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32)
+							[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32,value class System.Threading.CancellationToken)
+								[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.EndPoint,value class System.Threading.CancellationToken)
+									[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..ctor(class System.Net.Sockets.Socket,bool)
+										[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs..ctor(bool)
+										[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs..ctor(bool)
+									[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..ctor(class System.Net.Sockets.Socket,bool)
+									[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.ConnectAsync(class System.Net.Sockets.Socket)
+										[start] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.Sockets.SocketAsyncEventArgs,bool,bool)
+											[start] system.net.sockets!System.Net.Sockets.Socket.ValidateForMultiConnect(bool)
+												[start] system.net.sockets!System.Net.Sockets.Socket.ReplaceHandleIfNecessaryAfterFailedConnect()
+												[ end ] system.net.sockets!System.Net.Sockets.Socket.ReplaceHandleIfNecessaryAfterFailedConnect()
+											[ end ] system.net.sockets!System.Net.Sockets.Socket.ValidateForMultiConnect(bool)
+											[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.StartOperationCommon(class System.Net.Sockets.Socket,value class System.Net.Sockets.SocketAsyncOperation)
+												[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+													[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+												[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+													[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+												[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+													[start] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..ctor()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketsTelemetry..cctor()
+											[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.StartOperationCommon(class System.Net.Sockets.Socket,value class System.Net.Sockets.SocketAsyncOperation)
+											[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.DnsConnectAsync(class System.Net.DnsEndPoint,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+												[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.CopyBufferFrom(class System.Net.Sockets.SocketAsyncEventArgs)
+													[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.Complete()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.Complete()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.CopyBufferFrom(class System.Net.Sockets.SocketAsyncEventArgs)
+												[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.<DnsConnectAsync>g__Core|112_0(class MultiConnectSocketAsyncEventArgs,class System.Threading.Tasks.Task`1<class System.Net.IPAddress[]>,int32,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,value class System.Threading.CancellationToken)
+													[start] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs+<<DnsConnectAsync>g__Core|112_0>d.MoveNext()
+													[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs+<<DnsConnectAsync>g__Core|112_0>d.MoveNext()
+												[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.<DnsConnectAsync>g__Core|112_0(class MultiConnectSocketAsyncEventArgs,class System.Threading.Tasks.Task`1<class System.Net.IPAddress[]>,int32,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType,value class System.Threading.CancellationToken)
+											[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncEventArgs.DnsConnectAsync(class System.Net.DnsEndPoint,value class System.Net.Sockets.SocketType,value class System.Net.Sockets.ProtocolType)
+										[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.Sockets.SocketAsyncEventArgs,bool,bool)
+									[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.ConnectAsync(class System.Net.Sockets.Socket)
+									[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.GetStatus(int16)
+										[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..cctor()
+											[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs+<>c..cctor()
+											[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs+<>c..cctor()
+										[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs..cctor()
+									[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.GetStatus(int16)
+								[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.Net.EndPoint,value class System.Threading.CancellationToken)
+							[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32,value class System.Threading.CancellationToken)
+							[start] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.OnCompleted(class System.Action`1<class System.Object>,class System.Object,int16,value class System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags)
+							[ end ] system.net.sockets!System.Net.Sockets.Socket+AwaitableSocketAsyncEventArgs.OnCompleted(class System.Action`1<class System.Object>,class System.Object,int16,value class System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags)
+						[ end ] system.net.sockets!System.Net.Sockets.Socket.ConnectAsync(class System.String,int32)
+						[start] system.net.sockets!System.Threading.Tasks.TaskToApm.Begin(class System.Threading.Tasks.Task,class System.AsyncCallback,class System.Object)
+						[ end ] system.net.sockets!System.Threading.Tasks.TaskToApm.Begin(class System.Threading.Tasks.Task,class System.AsyncCallback,class System.Object)
+					[ end ] system.net.sockets!System.Net.Sockets.Socket.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+				[ end ] system.net.sockets!System.Net.Sockets.TcpClient.BeginConnect(class System.String,int32,class System.AsyncCallback,class System.Object)
+				[start] system.net.sockets!System.Threading.Tasks.TaskToApm+TaskAsyncResult.get_AsyncWaitHandle()
+				[ end ] system.net.sockets!System.Threading.Tasks.TaskToApm+TaskAsyncResult.get_AsyncWaitHandle()
+				[start] system.net.sockets!System.Net.Sockets.NetworkStream.Write(value class System.ReadOnlySpan`1<unsigned int8>)
+					[start] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags)
+						[start] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,value class System.Net.Sockets.SocketError&)
+							[start] system.net.sockets!System.Net.Sockets.SocketPal.Send(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32&)
+								[start] system.net.sockets!System.Net.Sockets.SocketAsyncContext.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32,int32&)
+									[start] system.net.sockets!System.Net.Sockets.SocketAsyncContext.SendTo(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32,int32&)
+										[start] system.net.sockets!System.Net.Sockets.SocketPal.TryCompleteSendTo(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,class System.Collections.Generic.IList`1<value class System.ArraySegment`1<unsigned int8>>,int32&,int32&,int32&,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32&,value class System.Net.Sockets.SocketError&)
+										[ end ] system.net.sockets!System.Net.Sockets.SocketPal.TryCompleteSendTo(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,class System.Collections.Generic.IList`1<value class System.ArraySegment`1<unsigned int8>>,int32&,int32&,int32&,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32&,value class System.Net.Sockets.SocketError&)
+									[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncContext.SendTo(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,unsigned int8[],int32,int32,int32&)
+								[ end ] system.net.sockets!System.Net.Sockets.SocketAsyncContext.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32,int32&)
+							[ end ] system.net.sockets!System.Net.Sockets.SocketPal.Send(class System.Net.Sockets.SafeSocketHandle,value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,int32&)
+						[ end ] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags,value class System.Net.Sockets.SocketError&)
+					[ end ] system.net.sockets!System.Net.Sockets.Socket.Send(value class System.ReadOnlySpan`1<unsigned int8>,value class System.Net.Sockets.SocketFlags)
+				[ end ] system.net.sockets!System.Net.Sockets.NetworkStream.Write(value class System.ReadOnlySpan`1<unsigned int8>)
+			[ end ] sockets!Program+<<Main>$>d__0.MoveNext()
+		[ end ] sockets!Program.<Main>$(class System.String[])
+	[ end ] sockets!Program.<Main>(class System.String[])
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..f8f29e7dd
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/SystemArrayPooling.gold
@@ -0,0 +1,2 @@
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/TaskTestProject1.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/TaskTestProject1.gold
new file mode 100644
index 000000000..c8e5cb4db
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/TaskTestProject1.gold
@@ -0,0 +1,4 @@
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/UnsafeFixed.gold b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/UnsafeFixed.gold
new file mode 100644
index 000000000..46ad3a5cf
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/MethodsStartEndTests/net9.0/UnsafeFixed.gold
@@ -0,0 +1,2 @@
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/macos/OcelEventsTest/net10.0/SimpleTest.gold b/Procfiler/test_data/gold/macos/OcelEventsTest/SimpleTest.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/OcelEventsTest/net10.0/SimpleTest.gold
rename to Procfiler/test_data/gold/macos/OcelEventsTest/SimpleTest.gold
diff --git a/Procfiler/test_data/gold/macos/OcelEventsTest/net10.0/SimpleTest2.gold b/Procfiler/test_data/gold/macos/OcelEventsTest/SimpleTest2.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/OcelEventsTest/net10.0/SimpleTest2.gold
rename to Procfiler/test_data/gold/macos/OcelEventsTest/SimpleTest2.gold
diff --git a/Procfiler/test_data/gold/macos/OcelEventsTest/net10.0/SimpleTest3.gold b/Procfiler/test_data/gold/macos/OcelEventsTest/SimpleTest3.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/OcelEventsTest/net10.0/SimpleTest3.gold
rename to Procfiler/test_data/gold/macos/OcelEventsTest/SimpleTest3.gold
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwait.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwait.gold
new file mode 100644
index 000000000..e6eac41e3
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwait.gold
@@ -0,0 +1,236 @@
+AsyncAwait.Program+<Main>d__0
+Trace:
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method1>d__1
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method2>d__2
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method3>d__3
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwaitTaskFactoryNew.gold
new file mode 100644
index 000000000..f40a8ac9b
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwaitTaskFactoryNew.gold
@@ -0,0 +1,30 @@
+AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+			[start] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+
+
+AsyncAwaitTaskFactoryNew.Program+<Main>d__0
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+			[start] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AsyncDisposable.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AsyncDisposable.gold
new file mode 100644
index 000000000..75ebfebd3
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AsyncDisposable.gold
@@ -0,0 +1,68 @@
+AsyncDisposable.Program+<Main>d__0
+Trace:
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+				[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+AsyncDisposable.Program+<Method1>d__1
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0
+Trace:
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AwaitForeach.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AwaitForeach.gold
new file mode 100644
index 000000000..ac4eed873
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/AwaitForeach.gold
@@ -0,0 +1,286 @@
+AwaitForeach.Program+<Allocate>d__2
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+
+AwaitForeach.Program+<EnumerateAsync>d__1
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+
+AwaitForeach.Program+<Main>d__0
+Trace:
+	[start] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+		[ end ] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/NotSimpleAsyncAwait.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/NotSimpleAsyncAwait.gold
new file mode 100644
index 000000000..de0eb5e5d
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/NotSimpleAsyncAwait.gold
@@ -0,0 +1,280 @@
+NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+
+NotSimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/SimpleAsyncAwait.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/SimpleAsyncAwait.gold
new file mode 100644
index 000000000..63c0fc58d
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net8.0/SimpleAsyncAwait.gold
@@ -0,0 +1,36 @@
+SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d
+Trace:
+	[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+	[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+
+
+SimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+			[start] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+		[start] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+			[start] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+			[start] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+		[start] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+		[start] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+			[start] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwait.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwait.gold
new file mode 100644
index 000000000..e6eac41e3
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwait.gold
@@ -0,0 +1,236 @@
+AsyncAwait.Program+<Main>d__0
+Trace:
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method1>d__1
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method2>d__2
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method3>d__3
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwaitTaskFactoryNew.gold
new file mode 100644
index 000000000..f40a8ac9b
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwaitTaskFactoryNew.gold
@@ -0,0 +1,30 @@
+AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+			[start] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+
+
+AsyncAwaitTaskFactoryNew.Program+<Main>d__0
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+			[start] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AsyncDisposable.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AsyncDisposable.gold
new file mode 100644
index 000000000..75ebfebd3
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AsyncDisposable.gold
@@ -0,0 +1,68 @@
+AsyncDisposable.Program+<Main>d__0
+Trace:
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+				[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+AsyncDisposable.Program+<Method1>d__1
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0
+Trace:
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AwaitForeach.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AwaitForeach.gold
new file mode 100644
index 000000000..ac4eed873
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/AwaitForeach.gold
@@ -0,0 +1,286 @@
+AwaitForeach.Program+<Allocate>d__2
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+
+AwaitForeach.Program+<EnumerateAsync>d__1
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+
+AwaitForeach.Program+<Main>d__0
+Trace:
+	[start] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+		[ end ] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/NotSimpleAsyncAwait.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/NotSimpleAsyncAwait.gold
new file mode 100644
index 000000000..de0eb5e5d
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/NotSimpleAsyncAwait.gold
@@ -0,0 +1,280 @@
+NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+
+NotSimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/SimpleAsyncAwait.gold b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/SimpleAsyncAwait.gold
new file mode 100644
index 000000000..63c0fc58d
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/OnlineAsyncMethodsGroupingTests/net9.0/SimpleAsyncAwait.gold
@@ -0,0 +1,36 @@
+SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d
+Trace:
+	[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+	[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+
+
+SimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+			[start] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+		[start] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+			[start] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+			[start] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+		[start] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+		[start] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+			[start] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold
new file mode 100644
index 000000000..7178bff37
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold
@@ -0,0 +1,236 @@
+ASYNC_AsyncAwait.Program+<Main>d__0
+Trace:
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method1>d__1
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method2>d__2
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method3>d__3
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold
new file mode 100644
index 000000000..76edaf195
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold
@@ -0,0 +1,30 @@
+ASYNC_AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+			[start] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwaitTaskFactoryNew.Program+<Main>d__0
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+			[start] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold
new file mode 100644
index 000000000..65c86d99d
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold
@@ -0,0 +1,68 @@
+ASYNC_AsyncDisposable.Program+<Main>d__0
+Trace:
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+				[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncDisposable.Program+<Method1>d__1
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0
+Trace:
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold
new file mode 100644
index 000000000..5507003cc
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold
@@ -0,0 +1,286 @@
+ASYNC_AwaitForeach.Program+<Allocate>d__2
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+
+ASYNC_AwaitForeach.Program+<EnumerateAsync>d__1
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AwaitForeach.Program+<Main>d__0
+Trace:
+	[start] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+		[ end ] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold
new file mode 100644
index 000000000..a366446ba
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold
@@ -0,0 +1,280 @@
+ASYNC_NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+
+ASYNC_NotSimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold
new file mode 100644
index 000000000..e8d7db06a
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold
@@ -0,0 +1,36 @@
+ASYNC_SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d
+Trace:
+	[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+	[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+
+
+ASYNC_SimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+			[start] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+		[start] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+			[start] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+			[start] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+		[start] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+		[start] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+			[start] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold
new file mode 100644
index 000000000..7178bff37
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold
@@ -0,0 +1,236 @@
+ASYNC_AsyncAwait.Program+<Main>d__0
+Trace:
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method1>d__1
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method2>d__2
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwait.Program+<Method3>d__3
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold
new file mode 100644
index 000000000..76edaf195
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold
@@ -0,0 +1,30 @@
+ASYNC_AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+			[start] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncAwaitTaskFactoryNew.Program+<Main>d__0
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+			[start] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold
new file mode 100644
index 000000000..65c86d99d
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold
@@ -0,0 +1,68 @@
+ASYNC_AsyncDisposable.Program+<Main>d__0
+Trace:
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+				[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncDisposable.Program+<Method1>d__1
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0
+Trace:
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold
new file mode 100644
index 000000000..5507003cc
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold
@@ -0,0 +1,286 @@
+ASYNC_AwaitForeach.Program+<Allocate>d__2
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+
+ASYNC_AwaitForeach.Program+<EnumerateAsync>d__1
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+
+ASYNC_AwaitForeach.Program+<Main>d__0
+Trace:
+	[start] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+		[ end ] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold
new file mode 100644
index 000000000..a366446ba
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold
@@ -0,0 +1,280 @@
+ASYNC_NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+
+ASYNC_NotSimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold
new file mode 100644
index 000000000..e8d7db06a
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold
@@ -0,0 +1,36 @@
+ASYNC_SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d
+Trace:
+	[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+	[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+
+
+ASYNC_SimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+			[start] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+		[start] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+			[start] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+			[start] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+		[start] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+		[start] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+			[start] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/ConsoleApp1.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/ConsoleApp1.gold
new file mode 100644
index 000000000..93a2b1d29
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/ConsoleApp1.gold
@@ -0,0 +1,41 @@
+Method: ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+Trace 1
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Method: ConsoleApp1.Program.Main[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+Method: ConsoleApp1.Program.Method1[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+Method: ConsoleApp1.Program.Method2[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..c0319364a
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..5cc114007
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..07bd7bf20
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,22 @@
+Method: ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Method: ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Method: ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..ec77375cb
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,14 @@
+Method: ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Method: ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/FileWriteProject.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/FileWriteProject.gold
new file mode 100644
index 000000000..c1e99db14
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/FileWriteProject.gold
@@ -0,0 +1,34 @@
+Method: FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Method: FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Method: FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Method: FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/FinalizableObject.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/FinalizableObject.gold
new file mode 100644
index 000000000..c577c2f5b
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/FinalizableObject.gold
@@ -0,0 +1,259 @@
+Method: FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace 0
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 1
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 2
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 3
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 4
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 5
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 6
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 7
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 8
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 9
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 10
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 11
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 12
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 13
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 14
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 15
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 16
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 17
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 18
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 19
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 20
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 21
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 22
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 23
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 24
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 25
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 26
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 27
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 28
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 29
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 30
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 31
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 32
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 33
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 34
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 35
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 36
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 37
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 38
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 39
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 40
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 41
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 42
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 43
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 44
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 45
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 46
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 47
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 48
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 49
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Method: FinalizableObject.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..7f83655d3
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+Method: IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/LOHAllocations.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/LOHAllocations.gold
new file mode 100644
index 000000000..404678d94
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+Method: LOHAllocations.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..9f8f8ac7a
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,40 @@
+Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/Sockets.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/Sockets.gold
new file mode 100644
index 000000000..b44f5a66e
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/Sockets.gold
@@ -0,0 +1,8 @@
+	[start] sockets!Program.<Main>(class System.String[])
+		[start] sockets!Program.<Main>$(class System.String[])
+			[start] sockets!Program+<<Main>$>d__0..ctor()
+			[ end ] sockets!Program+<<Main>$>d__0..ctor()
+			[start] sockets!Program+<<Main>$>d__0.MoveNext()
+			[ end ] sockets!Program+<<Main>$>d__0.MoveNext()
+		[ end ] sockets!Program.<Main>$(class System.String[])
+	[ end ] sockets!Program.<Main>(class System.String[])
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..4d58a3f5c
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+Method: SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/TaskTestProject1.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/TaskTestProject1.gold
new file mode 100644
index 000000000..187509991
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/TaskTestProject1.gold
@@ -0,0 +1,14 @@
+Method: TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Method: TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+Trace 0
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/UnsafeFixed.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/UnsafeFixed.gold
new file mode 100644
index 000000000..2f0b0664f
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net8.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+Method: UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/ConsoleApp1.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/ConsoleApp1.gold
new file mode 100644
index 000000000..93a2b1d29
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/ConsoleApp1.gold
@@ -0,0 +1,41 @@
+Method: ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+Trace 1
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Method: ConsoleApp1.Program.Main[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+Method: ConsoleApp1.Program.Method1[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+Method: ConsoleApp1.Program.Method2[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..c0319364a
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..5cc114007
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..07bd7bf20
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,22 @@
+Method: ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Method: ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Method: ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..ec77375cb
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,14 @@
+Method: ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Method: ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/FileWriteProject.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/FileWriteProject.gold
new file mode 100644
index 000000000..c1e99db14
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/FileWriteProject.gold
@@ -0,0 +1,34 @@
+Method: FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Method: FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Method: FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Method: FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/FinalizableObject.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/FinalizableObject.gold
new file mode 100644
index 000000000..c577c2f5b
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/FinalizableObject.gold
@@ -0,0 +1,259 @@
+Method: FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace 0
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 1
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 2
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 3
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 4
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 5
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 6
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 7
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 8
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 9
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 10
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 11
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 12
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 13
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 14
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 15
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 16
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 17
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 18
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 19
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 20
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 21
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 22
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 23
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 24
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 25
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 26
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 27
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 28
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 29
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 30
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 31
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 32
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 33
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 34
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 35
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 36
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 37
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 38
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 39
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 40
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 41
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 42
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 43
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 44
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 45
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 46
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 47
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 48
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 49
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Method: FinalizableObject.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..7f83655d3
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+Method: IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/LOHAllocations.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/LOHAllocations.gold
new file mode 100644
index 000000000..404678d94
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+Method: LOHAllocations.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..9f8f8ac7a
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,40 @@
+Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/Sockets.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/Sockets.gold
new file mode 100644
index 000000000..b44f5a66e
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/Sockets.gold
@@ -0,0 +1,8 @@
+	[start] sockets!Program.<Main>(class System.String[])
+		[start] sockets!Program.<Main>$(class System.String[])
+			[start] sockets!Program+<<Main>$>d__0..ctor()
+			[ end ] sockets!Program+<<Main>$>d__0..ctor()
+			[start] sockets!Program+<<Main>$>d__0.MoveNext()
+			[ end ] sockets!Program+<<Main>$>d__0.MoveNext()
+		[ end ] sockets!Program.<Main>$(class System.String[])
+	[ end ] sockets!Program.<Main>(class System.String[])
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..4d58a3f5c
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+Method: SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/TaskTestProject1.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/TaskTestProject1.gold
new file mode 100644
index 000000000..187509991
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/TaskTestProject1.gold
@@ -0,0 +1,14 @@
+Method: TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Method: TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+Trace 0
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/UnsafeFixed.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/UnsafeFixed.gold
new file mode 100644
index 000000000..2f0b0664f
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTests/net9.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+Method: UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/ConsoleApp1.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/ConsoleApp1.gold
new file mode 100644
index 000000000..568b71ad9
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/ConsoleApp1.gold
@@ -0,0 +1,31 @@
+Method: ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+Trace 1
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Method: ConsoleApp1.Program.Main[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Main[void..()]
+	[exec]ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+Method: ConsoleApp1.Program.Method1[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method1[void..()]
+	[exec]ConsoleApp1.Program..ctor[instance.void..()]
+	[exec]ConsoleApp1.Program.Method2[void..()]
+	[exec]ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+Method: ConsoleApp1.Program.Method2[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..c0319364a
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..5cc114007
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..a133519e8
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,20 @@
+Method: ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Method: ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Method: ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+	[exec]ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[exec]ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..e5b82c86c
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,13 @@
+Method: ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Method: ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+	[exec]ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/FileWriteProject.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/FileWriteProject.gold
new file mode 100644
index 000000000..439404490
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/FileWriteProject.gold
@@ -0,0 +1,26 @@
+Method: FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+	[exec]FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Method: FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[exec]FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Method: FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Method: FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/FinalizableObject.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/FinalizableObject.gold
new file mode 100644
index 000000000..99f103fb9
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/FinalizableObject.gold
@@ -0,0 +1,209 @@
+Method: FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace 0
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 1
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 2
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 3
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 4
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 5
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 6
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 7
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 8
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 9
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 10
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 11
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 12
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 13
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 14
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 15
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 16
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 17
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 18
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 19
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 20
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 21
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 22
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 23
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 24
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 25
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 26
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 27
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 28
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 29
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 30
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 31
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 32
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 33
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 34
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 35
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 36
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 37
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 38
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 39
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 40
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 41
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 42
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 43
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 44
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 45
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 46
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 47
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 48
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 49
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Method: FinalizableObject.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..7f83655d3
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+Method: IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/LOHAllocations.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/LOHAllocations.gold
new file mode 100644
index 000000000..404678d94
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+Method: LOHAllocations.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..b4ed29bf1
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,31 @@
+Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+	[exec]NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..4d58a3f5c
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+Method: SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/TaskTestProject1.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/TaskTestProject1.gold
new file mode 100644
index 000000000..419e89a13
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/TaskTestProject1.gold
@@ -0,0 +1,13 @@
+Method: TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+	[exec]TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Method: TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+Trace 0
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/UnsafeFixed.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/UnsafeFixed.gold
new file mode 100644
index 000000000..2f0b0664f
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+Method: UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/ConsoleApp1.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/ConsoleApp1.gold
new file mode 100644
index 000000000..568b71ad9
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/ConsoleApp1.gold
@@ -0,0 +1,31 @@
+Method: ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+Trace 1
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Method: ConsoleApp1.Program.Main[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Main[void..()]
+	[exec]ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+Method: ConsoleApp1.Program.Method1[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method1[void..()]
+	[exec]ConsoleApp1.Program..ctor[instance.void..()]
+	[exec]ConsoleApp1.Program.Method2[void..()]
+	[exec]ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+Method: ConsoleApp1.Program.Method2[void..()]
+
+Trace 0
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..c0319364a
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..5cc114007
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+Method: DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..a133519e8
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,20 @@
+Method: ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+Method: ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+Method: ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+	[exec]ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[exec]ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..e5b82c86c
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,13 @@
+Method: ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+Method: ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+	[exec]ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/FileWriteProject.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/FileWriteProject.gold
new file mode 100644
index 000000000..439404490
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/FileWriteProject.gold
@@ -0,0 +1,26 @@
+Method: FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+	[exec]FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+Method: FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Trace 0
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[exec]FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+Method: FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+Method: FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+Trace 0
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/FinalizableObject.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/FinalizableObject.gold
new file mode 100644
index 000000000..99f103fb9
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/FinalizableObject.gold
@@ -0,0 +1,209 @@
+Method: FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace 0
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 1
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 2
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 3
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 4
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 5
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 6
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 7
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 8
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 9
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 10
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 11
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 12
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 13
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 14
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 15
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 16
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 17
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 18
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 19
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 20
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 21
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 22
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 23
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 24
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 25
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 26
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 27
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 28
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 29
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 30
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 31
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 32
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 33
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 34
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 35
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 36
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 37
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 38
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 39
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 40
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 41
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 42
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 43
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 44
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 45
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 46
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 47
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 48
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace 49
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Method: FinalizableObject.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[exec]FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..7f83655d3
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+Method: IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/LOHAllocations.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/LOHAllocations.gold
new file mode 100644
index 000000000..404678d94
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+Method: LOHAllocations.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..b4ed29bf1
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,31 @@
+Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+	[exec]NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+Method: NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+Trace 0
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..4d58a3f5c
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+Method: SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/TaskTestProject1.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/TaskTestProject1.gold
new file mode 100644
index 000000000..419e89a13
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/TaskTestProject1.gold
@@ -0,0 +1,13 @@
+Method: TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+	[exec]TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+Method: TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+Trace 0
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/UnsafeFixed.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/UnsafeFixed.gold
new file mode 100644
index 000000000..2f0b0664f
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+Method: UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+Trace 0
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/ConsoleApp1.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/ConsoleApp1.gold
new file mode 100644
index 000000000..ef7620b97
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/ConsoleApp1.gold
@@ -0,0 +1,42 @@
+ConsoleApp1.Program..ctor[instance.void..()]
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+
+ConsoleApp1.Program.Main[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+
+ConsoleApp1.Program.Method1[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+
+ConsoleApp1.Program.Method2[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..fb60809b4
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..8694b6435
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..ccbf81c23
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,22 @@
+ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+Trace:
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+
+ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+Trace:
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+
+ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..cffb8cdce
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,14 @@
+ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+Trace:
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+
+ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/FileWriteProject.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/FileWriteProject.gold
new file mode 100644
index 000000000..aacd69ad4
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/FileWriteProject.gold
@@ -0,0 +1,34 @@
+FileWriteProject.Program.<Main>[void..(class.System.String[])]
+Trace:
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+
+FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+Trace:
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+
+FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+Trace:
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+
+FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+Trace:
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/FinalizableObject.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/FinalizableObject.gold
new file mode 100644
index 000000000..5ea326df0
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/FinalizableObject.gold
@@ -0,0 +1,506 @@
+FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+
+FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+
+FinalizableObject.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..f7d4f346b
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/LOHAllocations.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/LOHAllocations.gold
new file mode 100644
index 000000000..8319d613d
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+LOHAllocations.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..1642ba204
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,40 @@
+NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+
+NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+
+NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+
+NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+
+NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..ccd2759aa
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+SystemArrayPooling.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/TaskTestProject1.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/TaskTestProject1.gold
new file mode 100644
index 000000000..6687c221f
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/TaskTestProject1.gold
@@ -0,0 +1,26 @@
+TaskTestProject1.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/UnsafeFixed.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/UnsafeFixed.gold
new file mode 100644
index 000000000..cc637a95b
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net8.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+UnsafeFixed.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/ConsoleApp1.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/ConsoleApp1.gold
new file mode 100644
index 000000000..ef7620b97
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/ConsoleApp1.gold
@@ -0,0 +1,42 @@
+ConsoleApp1.Program..ctor[instance.void..()]
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+
+ConsoleApp1.Program.Main[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+
+ConsoleApp1.Program.Method1[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+
+ConsoleApp1.Program.Method2[void..()]
+Trace:
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..fb60809b4
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,6 @@
+DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..8694b6435
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,6 @@
+DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..ccbf81c23
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,22 @@
+ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+Trace:
+	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+
+
+ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+Trace:
+	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+
+
+ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..cffb8cdce
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,14 @@
+ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+Trace:
+	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+
+
+ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/FileWriteProject.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/FileWriteProject.gold
new file mode 100644
index 000000000..aacd69ad4
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/FileWriteProject.gold
@@ -0,0 +1,34 @@
+FileWriteProject.Program.<Main>[void..(class.System.String[])]
+Trace:
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+
+
+FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+Trace:
+	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+
+
+FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+Trace:
+	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+
+
+FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+Trace:
+	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/FinalizableObject.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/FinalizableObject.gold
new file mode 100644
index 000000000..5ea326df0
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/FinalizableObject.gold
@@ -0,0 +1,506 @@
+FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+
+
+FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+Trace:
+	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
+
+
+FinalizableObject.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..f7d4f346b
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,6 @@
+IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/LOHAllocations.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/LOHAllocations.gold
new file mode 100644
index 000000000..8319d613d
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/LOHAllocations.gold
@@ -0,0 +1,6 @@
+LOHAllocations.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..1642ba204
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,40 @@
+NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+
+
+NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+
+
+NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+
+
+NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+
+
+NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+Trace:
+	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..ccd2759aa
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/SystemArrayPooling.gold
@@ -0,0 +1,6 @@
+SystemArrayPooling.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/TaskTestProject1.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/TaskTestProject1.gold
new file mode 100644
index 000000000..6687c221f
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/TaskTestProject1.gold
@@ -0,0 +1,26 @@
+TaskTestProject1.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
+
+
+TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+Trace:
+	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
+
+
diff --git a/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/UnsafeFixed.gold b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/UnsafeFixed.gold
new file mode 100644
index 000000000..cc637a95b
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/CompletedMethodsExecutionsTests/net9.0/UnsafeFixed.gold
@@ -0,0 +1,6 @@
+UnsafeFixed.Program.Main[void..(class.System.String[])]
+Trace:
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
+
+
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/ConsoleApp1.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/ConsoleApp1.gold
new file mode 100644
index 000000000..465b6e7d7
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/ConsoleApp1.gold
@@ -0,0 +1,10 @@
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..aab87f6c1
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,2 @@
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..9695d47e2
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,2 @@
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..a044449c0
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,6 @@
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..8983b0e1c
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,4 @@
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/FileWriteProject.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/FileWriteProject.gold
new file mode 100644
index 000000000..7677af6a3
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/FileWriteProject.gold
@@ -0,0 +1,8 @@
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/FinalizableObject.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/FinalizableObject.gold
new file mode 100644
index 000000000..e17b1820d
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/FinalizableObject.gold
@@ -0,0 +1,102 @@
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..9ed884af8
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,2 @@
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/LOHAllocations.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/LOHAllocations.gold
new file mode 100644
index 000000000..bce4efdf1
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/LOHAllocations.gold
@@ -0,0 +1,2 @@
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..953d09e03
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,10 @@
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/Sockets.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/Sockets.gold
new file mode 100644
index 000000000..b44f5a66e
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/Sockets.gold
@@ -0,0 +1,8 @@
+	[start] sockets!Program.<Main>(class System.String[])
+		[start] sockets!Program.<Main>$(class System.String[])
+			[start] sockets!Program+<<Main>$>d__0..ctor()
+			[ end ] sockets!Program+<<Main>$>d__0..ctor()
+			[start] sockets!Program+<<Main>$>d__0.MoveNext()
+			[ end ] sockets!Program+<<Main>$>d__0.MoveNext()
+		[ end ] sockets!Program.<Main>$(class System.String[])
+	[ end ] sockets!Program.<Main>(class System.String[])
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..f8f29e7dd
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/SystemArrayPooling.gold
@@ -0,0 +1,2 @@
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/TaskTestProject1.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/TaskTestProject1.gold
new file mode 100644
index 000000000..c8e5cb4db
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/TaskTestProject1.gold
@@ -0,0 +1,4 @@
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/UnsafeFixed.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/UnsafeFixed.gold
new file mode 100644
index 000000000..46ad3a5cf
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net8.0/UnsafeFixed.gold
@@ -0,0 +1,2 @@
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/ConsoleApp1.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/ConsoleApp1.gold
new file mode 100644
index 000000000..465b6e7d7
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/ConsoleApp1.gold
@@ -0,0 +1,10 @@
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/DynamicAssemblyCreation.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/DynamicAssemblyCreation.gold
new file mode 100644
index 000000000..aab87f6c1
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/DynamicAssemblyCreation.gold
@@ -0,0 +1,2 @@
+	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/DynamicAssemblyLoading.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/DynamicAssemblyLoading.gold
new file mode 100644
index 000000000..9695d47e2
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/DynamicAssemblyLoading.gold
@@ -0,0 +1,2 @@
+	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/ExceptionTryCatchFinally.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/ExceptionTryCatchFinally.gold
new file mode 100644
index 000000000..a044449c0
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/ExceptionTryCatchFinally.gold
@@ -0,0 +1,6 @@
+	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
+		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
+	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/ExceptionTryCatchFinallyWhen.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/ExceptionTryCatchFinallyWhen.gold
new file mode 100644
index 000000000..8983b0e1c
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/ExceptionTryCatchFinallyWhen.gold
@@ -0,0 +1,4 @@
+	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
+		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
+	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/FileWriteProject.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/FileWriteProject.gold
new file mode 100644
index 000000000..7677af6a3
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/FileWriteProject.gold
@@ -0,0 +1,8 @@
+	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
+		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
+			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
+		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
+	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/FinalizableObject.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/FinalizableObject.gold
new file mode 100644
index 000000000..e17b1820d
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/FinalizableObject.gold
@@ -0,0 +1,102 @@
+	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
+	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/IntensiveThreadPoolUse.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/IntensiveThreadPoolUse.gold
new file mode 100644
index 000000000..9ed884af8
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/IntensiveThreadPoolUse.gold
@@ -0,0 +1,2 @@
+	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
+	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/LOHAllocations.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/LOHAllocations.gold
new file mode 100644
index 000000000..bce4efdf1
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/LOHAllocations.gold
@@ -0,0 +1,2 @@
+	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
+	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/NotExistingAssemblyLoading.gold
new file mode 100644
index 000000000..953d09e03
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/NotExistingAssemblyLoading.gold
@@ -0,0 +1,10 @@
+	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
+		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
+		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
+	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/Sockets.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/Sockets.gold
new file mode 100644
index 000000000..b44f5a66e
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/Sockets.gold
@@ -0,0 +1,8 @@
+	[start] sockets!Program.<Main>(class System.String[])
+		[start] sockets!Program.<Main>$(class System.String[])
+			[start] sockets!Program+<<Main>$>d__0..ctor()
+			[ end ] sockets!Program+<<Main>$>d__0..ctor()
+			[start] sockets!Program+<<Main>$>d__0.MoveNext()
+			[ end ] sockets!Program+<<Main>$>d__0.MoveNext()
+		[ end ] sockets!Program.<Main>$(class System.String[])
+	[ end ] sockets!Program.<Main>(class System.String[])
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/SystemArrayPooling.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/SystemArrayPooling.gold
new file mode 100644
index 000000000..f8f29e7dd
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/SystemArrayPooling.gold
@@ -0,0 +1,2 @@
+	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
+	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/TaskTestProject1.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/TaskTestProject1.gold
new file mode 100644
index 000000000..c8e5cb4db
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/TaskTestProject1.gold
@@ -0,0 +1,4 @@
+	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
+		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/UnsafeFixed.gold b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/UnsafeFixed.gold
new file mode 100644
index 000000000..46ad3a5cf
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/MethodsStartEndTests/net9.0/UnsafeFixed.gold
@@ -0,0 +1,2 @@
+	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
+	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
diff --git a/Procfiler/test_data/gold/windows/OcelEventsTest/net10.0/SimpleTest.gold b/Procfiler/test_data/gold/windows/OcelEventsTest/SimpleTest.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/OcelEventsTest/net10.0/SimpleTest.gold
rename to Procfiler/test_data/gold/windows/OcelEventsTest/SimpleTest.gold
diff --git a/Procfiler/test_data/gold/windows/OcelEventsTest/net10.0/SimpleTest2.gold b/Procfiler/test_data/gold/windows/OcelEventsTest/SimpleTest2.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/OcelEventsTest/net10.0/SimpleTest2.gold
rename to Procfiler/test_data/gold/windows/OcelEventsTest/SimpleTest2.gold
diff --git a/Procfiler/test_data/gold/windows/OcelEventsTest/net10.0/SimpleTest3.gold b/Procfiler/test_data/gold/windows/OcelEventsTest/SimpleTest3.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/OcelEventsTest/net10.0/SimpleTest3.gold
rename to Procfiler/test_data/gold/windows/OcelEventsTest/SimpleTest3.gold
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwait.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwait.gold
new file mode 100644
index 000000000..e6eac41e3
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwait.gold
@@ -0,0 +1,236 @@
+AsyncAwait.Program+<Main>d__0
+Trace:
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method1>d__1
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method2>d__2
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method3>d__3
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwaitTaskFactoryNew.gold
new file mode 100644
index 000000000..f40a8ac9b
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AsyncAwaitTaskFactoryNew.gold
@@ -0,0 +1,30 @@
+AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+			[start] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+
+
+AsyncAwaitTaskFactoryNew.Program+<Main>d__0
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+			[start] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AsyncDisposable.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AsyncDisposable.gold
new file mode 100644
index 000000000..75ebfebd3
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AsyncDisposable.gold
@@ -0,0 +1,68 @@
+AsyncDisposable.Program+<Main>d__0
+Trace:
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+				[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+AsyncDisposable.Program+<Method1>d__1
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0
+Trace:
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AwaitForeach.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AwaitForeach.gold
new file mode 100644
index 000000000..ac4eed873
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/AwaitForeach.gold
@@ -0,0 +1,286 @@
+AwaitForeach.Program+<Allocate>d__2
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+
+AwaitForeach.Program+<EnumerateAsync>d__1
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+
+AwaitForeach.Program+<Main>d__0
+Trace:
+	[start] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+		[ end ] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/NotSimpleAsyncAwait.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/NotSimpleAsyncAwait.gold
new file mode 100644
index 000000000..de0eb5e5d
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/NotSimpleAsyncAwait.gold
@@ -0,0 +1,280 @@
+NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+
+NotSimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/SimpleAsyncAwait.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/SimpleAsyncAwait.gold
new file mode 100644
index 000000000..63c0fc58d
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net8.0/SimpleAsyncAwait.gold
@@ -0,0 +1,36 @@
+SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d
+Trace:
+	[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+	[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+
+
+SimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+			[start] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+		[start] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+			[start] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+			[start] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+		[start] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+		[start] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+			[start] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwait.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwait.gold
new file mode 100644
index 000000000..e6eac41e3
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwait.gold
@@ -0,0 +1,236 @@
+AsyncAwait.Program+<Main>d__0
+Trace:
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+		[start] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+				[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+						[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+							[start] AsyncAwait.Method1..ctor[instance.void..()]
+							[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+						[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+					[start] AsyncAwait.Method2..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method2[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+			[start] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+					[start] AsyncAwait.Method3..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method3[class.System.Threading.Tasks.Task..()]
+	[ end ] AsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method1>d__1
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[start] AsyncAwait.Method1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+	[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method2>d__2
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+		[start] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[start] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+					[start] AsyncAwait.Method1..ctor[instance.void..()]
+					[ end ] AsyncAwait.Method1..ctor[instance.void..()]
+				[ end ] AsyncAwait.Program.Allocate1[class.AsyncAwait.Method1..()]
+			[ end ] AsyncAwait.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncAwait.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+	[start] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+			[start] AsyncAwait.Method2..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method2..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate2[class.AsyncAwait.Method2..()]
+	[ end ] AsyncAwait.Program+<Method2>d__2.MoveNext[instance.void..()]
+
+
+AsyncAwait.Program+<Method3>d__3
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+		[start] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+			[start] AsyncAwait.Method3..ctor[instance.void..()]
+			[ end ] AsyncAwait.Method3..ctor[instance.void..()]
+		[ end ] AsyncAwait.Program.Allocate3[class.AsyncAwait.Method3..()]
+	[ end ] AsyncAwait.Program+<Method3>d__3.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwaitTaskFactoryNew.gold
new file mode 100644
index 000000000..f40a8ac9b
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AsyncAwaitTaskFactoryNew.gold
@@ -0,0 +1,30 @@
+AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+			[start] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.XdClass2..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program.Allocate2[class.System.Object..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<>c+<<Main>b__0_2>d.MoveNext[instance.void..()]
+
+
+AsyncAwaitTaskFactoryNew.Program+<Main>d__0
+Trace:
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+			[start] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+			[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..ctor[instance.void..()]
+		[ end ] AsyncAwaitTaskFactoryNew.Program+<>c..cctor[void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncAwaitTaskFactoryNew.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AsyncDisposable.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AsyncDisposable.gold
new file mode 100644
index 000000000..75ebfebd3
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AsyncDisposable.gold
@@ -0,0 +1,68 @@
+AsyncDisposable.Program+<Main>d__0
+Trace:
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable..ctor[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+				[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+					[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+					[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+				[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
+AsyncDisposable.Program+<Method1>d__1
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+
+
+AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0
+Trace:
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+		[start] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1..ctor[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[start] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+			[ end ] AsyncDisposable.Program+<Method1>d__1.MoveNext[instance.void..()]
+		[ end ] AsyncDisposable.Program.Method1[class.System.Threading.Tasks.Task`1<int32>..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[start] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+	[ end ] AsyncDisposable.Program+Nested1+Nested2+Nested3+AsyncDisposable+<DisposeAsync>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AwaitForeach.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AwaitForeach.gold
new file mode 100644
index 000000000..ac4eed873
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/AwaitForeach.gold
@@ -0,0 +1,286 @@
+AwaitForeach.Program+<Allocate>d__2
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+
+
+AwaitForeach.Program+<EnumerateAsync>d__1
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+			[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+Trace:
+	[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+	[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+
+
+AwaitForeach.Program+<Main>d__0
+Trace:
+	[start] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1..ctor[instance.void..(int32)]
+		[ end ] AwaitForeach.Program.EnumerateAsync[class.System.Collections.Generic.IAsyncEnumerable`1<class.System.Object>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerable<System.Object>.GetAsyncEnumerator[instance.class.System.Collections.Generic.IAsyncEnumerator`1<class.System.Object>..(value.class.System.Threading.CancellationToken)]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+				[start] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+					[start] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2..ctor[instance.void..()]
+					[start] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+					[ end ] AwaitForeach.Program+<Allocate>d__2.MoveNext[instance.void..()]
+				[ end ] AwaitForeach.Program.Allocate[class.System.Threading.Tasks.Task`1<class.System.Object>..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.get_Current[instance.class.System.Object..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+			[start] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+			[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.MoveNext[instance.void..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.Collections.Generic.IAsyncEnumerator<System.Object>.MoveNextAsync[instance.value.class.System.Threading.Tasks.ValueTask`1<bool>..()]
+		[start] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+		[ end ] AwaitForeach.Program+<EnumerateAsync>d__1.System.IAsyncDisposable.DisposeAsync[instance.value.class.System.Threading.Tasks.ValueTask..()]
+	[ end ] AwaitForeach.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/NotSimpleAsyncAwait.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/NotSimpleAsyncAwait.gold
new file mode 100644
index 000000000..de0eb5e5d
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/NotSimpleAsyncAwait.gold
@@ -0,0 +1,280 @@
+NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0+<<Main>b__0>d.MoveNext[instance.void..()]
+
+
+NotSimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate1[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate2[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate3[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[ end ] NotSimpleAsyncAwait.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
+		[start] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+			[start] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+				[start] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+				[ end ] NotSimpleAsyncAwait.Class4..ctor[instance.void..()]
+			[ end ] NotSimpleAsyncAwait.Program.Allocate4[class.System.Object..()]
+		[ end ] NotSimpleAsyncAwait.Program.Allocate[class.System.Object..(int32)]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[ end ] NotSimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/SimpleAsyncAwait.gold b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/SimpleAsyncAwait.gold
new file mode 100644
index 000000000..63c0fc58d
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/OnlineAsyncMethodsGroupingTests/net9.0/SimpleAsyncAwait.gold
@@ -0,0 +1,36 @@
+SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d
+Trace:
+	[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+	[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+
+
+SimpleAsyncAwait.Program+<Main>d__0
+Trace:
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+			[start] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class1..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate1[class.SimpleAsyncAwait.Class1..()]
+		[start] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+			[start] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<>c..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program+<>c..cctor[void..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+	[start] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+		[start] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+			[start] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class2..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate2[class.SimpleAsyncAwait.Class2..()]
+		[start] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d..ctor[instance.void..()]
+			[start] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+			[ end ] SimpleAsyncAwait.Program+<<Main>g__Foo|0_1>d.MoveNext[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.<Main>g__Foo|0_1[class.System.Threading.Tasks.Task`1<int32>..()]
+		[start] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+			[start] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+			[ end ] SimpleAsyncAwait.Class3..ctor[instance.void..()]
+		[ end ] SimpleAsyncAwait.Program.Allocate3[class.SimpleAsyncAwait.Class3..()]
+	[ end ] SimpleAsyncAwait.Program+<Main>d__0.MoveNext[instance.void..()]
+
+

From 88d04d0584ef175790ebfe7e12998e33834993c6 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sat, 2 May 2026 18:58:22 +0300
Subject: [PATCH 16/53] Make async tests use different tfms

---
 .../Tests/OnlineAsyncMethodsGroupingTests.cs  | 11 ++--------
 .../AsyncMethodsGroupingTest.cs               | 21 +++----------------
 .../src/dotnet/TestsUtil/KnownSolution.cs     | 19 +++++++++++++++--
 3 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/Procfiler/src/dotnet/OnlineProcfilerTests/Tests/OnlineAsyncMethodsGroupingTests.cs b/Procfiler/src/dotnet/OnlineProcfilerTests/Tests/OnlineAsyncMethodsGroupingTests.cs
index 129e9df7e..90e41b4d7 100644
--- a/Procfiler/src/dotnet/OnlineProcfilerTests/Tests/OnlineAsyncMethodsGroupingTests.cs
+++ b/Procfiler/src/dotnet/OnlineProcfilerTests/Tests/OnlineAsyncMethodsGroupingTests.cs
@@ -25,19 +25,12 @@ public void Handle(IEventPipeStreamEvent eventPipeStreamEvent)
 [NonParallelizable]
 public class OnlineAsyncMethodsGroupingTests : OnlineProcfilerMethodsTest
 {
-  private static IEnumerable<KnownSolution> ourAsyncSolutions =
-  [
-    KnownSolution.SimpleAsyncAwait,
-    KnownSolution.NotSimpleAsyncAwait,
-    KnownSolution.AsyncAwait,
-    KnownSolution.AsyncDisposable,
-    KnownSolution.AwaitForeach,
-    KnownSolution.AsyncAwaitTaskFactoryNew
-  ];
+  private static readonly IEnumerable<KnownSolution> ourAsyncSolutions = KnownSolution.AsyncSolutions;
 
 
   private readonly TestAsyncMethodsHandler myHandler = new();
 
+
   protected override IEnumerable<IEventPipeStreamEventHandler> HandlersToRegister =>
   [
     myHandler
diff --git a/Procfiler/src/dotnet/ProcfilerTests/Tests/AsyncMethodsGroupingTests/AsyncMethodsGroupingTest.cs b/Procfiler/src/dotnet/ProcfilerTests/Tests/AsyncMethodsGroupingTests/AsyncMethodsGroupingTest.cs
index ed35df39a..1b163d63a 100644
--- a/Procfiler/src/dotnet/ProcfilerTests/Tests/AsyncMethodsGroupingTests/AsyncMethodsGroupingTest.cs
+++ b/Procfiler/src/dotnet/ProcfilerTests/Tests/AsyncMethodsGroupingTests/AsyncMethodsGroupingTest.cs
@@ -13,26 +13,11 @@ namespace ProcfilerTests.Tests.AsyncMethodsGroupingTests;
 [TestFixture]
 public class AsyncMethodsGroupingTest : GoldProcessBasedTest
 {
-  [Test]
-  public void TestNotSimpleAsync() => DoSimpleTest(KnownSolution.NotSimpleAsyncAwait);
+  private static readonly IEnumerable<KnownSolution> ourAsyncSolutions = KnownSolution.AsyncSolutions;
 
-  [Test]
-  public void TestSimpleAsyncAwait() => DoSimpleTest(KnownSolution.SimpleAsyncAwait);
 
-  [Test]
-  public void TestAsyncAwait() => DoSimpleTest(KnownSolution.AsyncAwait);
-
-  [Test]
-  public void TestAsyncAwaitTaskFactoryNew() => DoSimpleTest(KnownSolution.AsyncAwaitTaskFactoryNew);
-
-  [Test]
-  public void TestAwaitForeach() => DoSimpleTest(KnownSolution.AwaitForeach);
-
-  [Test]
-  public void TestAsyncDisposable() => DoSimpleTest(KnownSolution.AsyncDisposable);
-
-
-  private void DoSimpleTest(KnownSolution solution)
+  [TestCaseSource(nameof(ourAsyncSolutions))]
+  public void DoTest(KnownSolution solution)
   {
     ExecuteTestWithGold(
       solution.CreateDefaultContext(),
diff --git a/Procfiler/src/dotnet/TestsUtil/KnownSolution.cs b/Procfiler/src/dotnet/TestsUtil/KnownSolution.cs
index 9c1cec0fc..c849742bc 100644
--- a/Procfiler/src/dotnet/TestsUtil/KnownSolution.cs
+++ b/Procfiler/src/dotnet/TestsUtil/KnownSolution.cs
@@ -58,8 +58,23 @@ public record KnownSolution
   ];
 
 
-  public static IEnumerable<KnownSolution> AllSolutions { get; } =
-    ourSolutions.Concat(ourSolutions.Select(s => s with { Tfm = Net9 }).Concat(ourSolutions.Select(s => s with { Tfm = Net8 })));
+  private static KnownSolution[] ourAsyncSolutions =
+  [
+    SimpleAsyncAwait,
+    NotSimpleAsyncAwait,
+    AsyncAwait,
+    AsyncDisposable,
+    AwaitForeach,
+    AsyncAwaitTaskFactoryNew
+  ];
+
+
+  public static IEnumerable<KnownSolution> AllSolutions { get; } = AdjustTargetFrameworks(ourSolutions);
+  public static IEnumerable<KnownSolution> AsyncSolutions { get; } = AdjustTargetFrameworks(ourAsyncSolutions);
+
+  private static IEnumerable<KnownSolution> AdjustTargetFrameworks(KnownSolution[] solutions) =>
+    solutions.Concat(solutions.Select(s => s with { Tfm = Net9 }).Concat(solutions.Select(s => s with { Tfm = Net8 })));
+
 
   public string Name { get; }
   public string Tfm { get; private init; }

From 23eb401afaefc4697699286ec13b56d60d1f29c3 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sat, 2 May 2026 19:01:33 +0300
Subject: [PATCH 17/53] Fix gold

---
 .../net8.0/NotExistingAssemblyLoading.gold                       | 1 +
 .../net9.0/NotExistingAssemblyLoading.gold                       | 1 +
 .../net8.0/NotExistingAssemblyLoading.gold                       | 1 +
 .../net9.0/NotExistingAssemblyLoading.gold                       | 1 +
 .../net8.0/NotExistingAssemblyLoading.gold                       | 1 +
 .../net9.0/NotExistingAssemblyLoading.gold                       | 1 +
 6 files changed, 6 insertions(+)

diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
index b4ed29bf1..5fc0c9196 100644
--- a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
@@ -2,6 +2,7 @@ Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
 
 Trace 0
 	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[exec]NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
 	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
 
 Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
diff --git a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
index b4ed29bf1..5fc0c9196 100644
--- a/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
+++ b/Procfiler/test_data/gold/linux/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
@@ -2,6 +2,7 @@ Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
 
 Trace 0
 	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[exec]NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
 	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
 
 Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
index b4ed29bf1..5fc0c9196 100644
--- a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
@@ -2,6 +2,7 @@ Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
 
 Trace 0
 	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[exec]NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
 	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
 
 Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
diff --git a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
index b4ed29bf1..5fc0c9196 100644
--- a/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
+++ b/Procfiler/test_data/gold/macos/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
@@ -2,6 +2,7 @@ Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
 
 Trace 0
 	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[exec]NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
 	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
 
 Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
index b4ed29bf1..5fc0c9196 100644
--- a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net8.0/NotExistingAssemblyLoading.gold
@@ -2,6 +2,7 @@ Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
 
 Trace 0
 	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[exec]NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
 	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
 
 Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
diff --git a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
index b4ed29bf1..5fc0c9196 100644
--- a/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
+++ b/Procfiler/test_data/gold/windows/ByMethodSplitTestsNoInline/net9.0/NotExistingAssemblyLoading.gold
@@ -2,6 +2,7 @@ Method: NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
 
 Trace 0
 	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
+	[exec]NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
 	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
 
 Method: NotExistingAssemblyLoading.Program+<>c..cctor[void..()]

From 086750406a332671364756d981a13d00a0c87e57 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sat, 2 May 2026 19:15:55 +0300
Subject: [PATCH 18/53] Update test sources with different tfms

---
 Procfiler/test_data/source/AsyncAwait/AsyncAwait.csproj         | 2 +-
 .../AsyncAwaitTaskFactoryNew/AsyncAwaitTaskFactoryNew.csproj    | 2 +-
 .../test_data/source/AsyncDisposable/AsyncDisposable.csproj     | 2 +-
 Procfiler/test_data/source/AwaitForeach/AwaitForeach.csproj     | 2 +-
 Procfiler/test_data/source/Ocel/Ocel.csproj                     | 2 +-
 Procfiler/test_data/source/Ocel2/Ocel2.csproj                   | 2 +-
 Procfiler/test_data/source/OcelWithIfs/OcelWithIfs.csproj       | 2 +-
 .../ProcfilerEventPipeLogger/ProcfilerEventPipeLogger.csproj    | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Procfiler/test_data/source/AsyncAwait/AsyncAwait.csproj b/Procfiler/test_data/source/AsyncAwait/AsyncAwait.csproj
index 17ca97ba9..80fcfecee 100644
--- a/Procfiler/test_data/source/AsyncAwait/AsyncAwait.csproj
+++ b/Procfiler/test_data/source/AsyncAwait/AsyncAwait.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
diff --git a/Procfiler/test_data/source/AsyncAwaitTaskFactoryNew/AsyncAwaitTaskFactoryNew.csproj b/Procfiler/test_data/source/AsyncAwaitTaskFactoryNew/AsyncAwaitTaskFactoryNew.csproj
index 17ca97ba9..80fcfecee 100644
--- a/Procfiler/test_data/source/AsyncAwaitTaskFactoryNew/AsyncAwaitTaskFactoryNew.csproj
+++ b/Procfiler/test_data/source/AsyncAwaitTaskFactoryNew/AsyncAwaitTaskFactoryNew.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
diff --git a/Procfiler/test_data/source/AsyncDisposable/AsyncDisposable.csproj b/Procfiler/test_data/source/AsyncDisposable/AsyncDisposable.csproj
index ed9781c22..99249bd9d 100644
--- a/Procfiler/test_data/source/AsyncDisposable/AsyncDisposable.csproj
+++ b/Procfiler/test_data/source/AsyncDisposable/AsyncDisposable.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Procfiler/test_data/source/AwaitForeach/AwaitForeach.csproj b/Procfiler/test_data/source/AwaitForeach/AwaitForeach.csproj
index ed9781c22..99249bd9d 100644
--- a/Procfiler/test_data/source/AwaitForeach/AwaitForeach.csproj
+++ b/Procfiler/test_data/source/AwaitForeach/AwaitForeach.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Procfiler/test_data/source/Ocel/Ocel.csproj b/Procfiler/test_data/source/Ocel/Ocel.csproj
index 08bb8f3e5..b8484e1b5 100644
--- a/Procfiler/test_data/source/Ocel/Ocel.csproj
+++ b/Procfiler/test_data/source/Ocel/Ocel.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Procfiler/test_data/source/Ocel2/Ocel2.csproj b/Procfiler/test_data/source/Ocel2/Ocel2.csproj
index 08bb8f3e5..b8484e1b5 100644
--- a/Procfiler/test_data/source/Ocel2/Ocel2.csproj
+++ b/Procfiler/test_data/source/Ocel2/Ocel2.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net10.0;net9.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Procfiler/test_data/source/OcelWithIfs/OcelWithIfs.csproj b/Procfiler/test_data/source/OcelWithIfs/OcelWithIfs.csproj
index 5c6c8d353..82bb9a944 100644
--- a/Procfiler/test_data/source/OcelWithIfs/OcelWithIfs.csproj
+++ b/Procfiler/test_data/source/OcelWithIfs/OcelWithIfs.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/Procfiler/test_data/source/ProcfilerEventPipeLogger/ProcfilerEventPipeLogger.csproj b/Procfiler/test_data/source/ProcfilerEventPipeLogger/ProcfilerEventPipeLogger.csproj
index 1683781c7..94daaf26a 100644
--- a/Procfiler/test_data/source/ProcfilerEventPipeLogger/ProcfilerEventPipeLogger.csproj
+++ b/Procfiler/test_data/source/ProcfilerEventPipeLogger/ProcfilerEventPipeLogger.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFrameworks>net10.0;net9.0;net8.0;net7.0;net6.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

From 6d67671b3c5bd75d773a413460e8312e61806d6f Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sat, 2 May 2026 20:12:35 +0300
Subject: [PATCH 19/53] Don't use solutions with all tfms in onlinline
 procfiler integration test

---
 .../IntegrationTests/Kafka/OnlineProcfilerKafkaTests.cs         | 2 +-
 Procfiler/src/dotnet/TestsUtil/KnownSolution.cs                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Procfiler/src/dotnet/OnlineProcfilerTests/IntegrationTests/Kafka/OnlineProcfilerKafkaTests.cs b/Procfiler/src/dotnet/OnlineProcfilerTests/IntegrationTests/Kafka/OnlineProcfilerKafkaTests.cs
index 326fa1e0e..a13d83329 100644
--- a/Procfiler/src/dotnet/OnlineProcfilerTests/IntegrationTests/Kafka/OnlineProcfilerKafkaTests.cs
+++ b/Procfiler/src/dotnet/OnlineProcfilerTests/IntegrationTests/Kafka/OnlineProcfilerKafkaTests.cs
@@ -21,7 +21,7 @@ public class OnlineProcfilerKafkaTests : OnlineProcfilerTestWithGold
 
 
   [Test]
-  public void AllSolutionsTest() => Execute(() => DoExecuteTest(KnownSolution.AllSolutions));
+  public void AllSolutionsTest() => Execute(() => DoExecuteTest(KnownSolution.AllSolutionsLatestFramework));
 
 
   private string DoExecuteTest(IEnumerable<KnownSolution> solutions)
diff --git a/Procfiler/src/dotnet/TestsUtil/KnownSolution.cs b/Procfiler/src/dotnet/TestsUtil/KnownSolution.cs
index c849742bc..13b20ad9e 100644
--- a/Procfiler/src/dotnet/TestsUtil/KnownSolution.cs
+++ b/Procfiler/src/dotnet/TestsUtil/KnownSolution.cs
@@ -69,6 +69,7 @@ public record KnownSolution
   ];
 
 
+  public static IEnumerable<KnownSolution> AllSolutionsLatestFramework => ourSolutions;
   public static IEnumerable<KnownSolution> AllSolutions { get; } = AdjustTargetFrameworks(ourSolutions);
   public static IEnumerable<KnownSolution> AsyncSolutions { get; } = AdjustTargetFrameworks(ourAsyncSolutions);
 

From 341cf0fcf477ec19956afaa2a55fb0e6f79fff43 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sun, 3 May 2026 12:01:09 +0300
Subject: [PATCH 20/53] Meaningless refactorings

---
 .../src/grpc/kafka/streaming/t1/processors.rs    | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
index f616e68c6..477997c43 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
@@ -10,7 +10,7 @@ use ficus::{
   event_log::{
     bxes::bxes_to_xes_converter::read_bxes_events,
     core::{event::event::EventPayloadValue, event_log::EventLog, trace::trace::Trace},
-    xes::{xes_event_log::XesEventLogImpl, xes_trace::XesTraceImpl},
+    xes::{xes_event_log::XesEventLogImpl},
   },
   features::streaming::t1::filterers::T1LogFilterer,
   pipelines::{
@@ -96,9 +96,9 @@ impl T1StreamingProcessor {
 
     for existing_xes_trace in existing_log.traces() {
       let mut existing_xes_trace = existing_xes_trace.borrow_mut();
-      if let Some(current_trace_id) = Self::try_get_trace_id(&existing_xes_trace) {
-        if current_trace_id == trace_id {
-          info!("Found an existing trace for trace id {}, appending it", current_trace_id);
+      if let Some(EventPayloadValue::Guid(id)) = existing_xes_trace.metadata().get(KAFKA_TRACE_ID).cloned() {
+        if id == trace_id {
+          info!("Found an existing trace for trace id {}, appending it", id);
 
           for event in read_xes_trace.events() {
             existing_xes_trace.push(event.clone());
@@ -121,12 +121,4 @@ impl T1StreamingProcessor {
 
     Ok(existing_log.clone())
   }
-
-  fn try_get_trace_id(trace: &XesTraceImpl) -> Option<Uuid> {
-    if let Some(EventPayloadValue::Guid(id)) = trace.metadata().get(KAFKA_TRACE_ID) {
-      Some(*id)
-    } else {
-      None
-    }
-  }
 }

From 20e72a92add8d536514ea281d26f5a94d280b1e9 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sun, 3 May 2026 18:10:17 +0300
Subject: [PATCH 21/53] Fix procfiler async grouping tests

---
 .../ProcfilerTests/Core/TestWithContainerBase.cs   |  3 +++
 .../AsyncMethodsGroupingTest.cs                    | 14 +++++---------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Procfiler/src/dotnet/ProcfilerTests/Core/TestWithContainerBase.cs b/Procfiler/src/dotnet/ProcfilerTests/Core/TestWithContainerBase.cs
index d355d018e..a116fdb96 100644
--- a/Procfiler/src/dotnet/ProcfilerTests/Core/TestWithContainerBase.cs
+++ b/Procfiler/src/dotnet/ProcfilerTests/Core/TestWithContainerBase.cs
@@ -12,6 +12,9 @@ public record ContextWithSolution(KnownSolution Solution, CollectClrEventsFromEx
 
 public abstract class TestWithContainerBase
 {
+  protected static IEnumerable<ContextWithSolution> AsyncDefaultContexts() =>
+    KnownSolution.AsyncSolutions.Select(s => new ContextWithSolution(s, s.CreateDefaultContext()));
+
   protected static IEnumerable<ContextWithSolution> DefaultContexts() =>
     KnownSolution.AllSolutions.Select(s => new ContextWithSolution(s, s.CreateDefaultContext()));
 
diff --git a/Procfiler/src/dotnet/ProcfilerTests/Tests/AsyncMethodsGroupingTests/AsyncMethodsGroupingTest.cs b/Procfiler/src/dotnet/ProcfilerTests/Tests/AsyncMethodsGroupingTests/AsyncMethodsGroupingTest.cs
index 1b163d63a..7e84539c2 100644
--- a/Procfiler/src/dotnet/ProcfilerTests/Tests/AsyncMethodsGroupingTests/AsyncMethodsGroupingTest.cs
+++ b/Procfiler/src/dotnet/ProcfilerTests/Tests/AsyncMethodsGroupingTests/AsyncMethodsGroupingTest.cs
@@ -13,16 +13,12 @@ namespace ProcfilerTests.Tests.AsyncMethodsGroupingTests;
 [TestFixture]
 public class AsyncMethodsGroupingTest : GoldProcessBasedTest
 {
-  private static readonly IEnumerable<KnownSolution> ourAsyncSolutions = KnownSolution.AsyncSolutions;
-
-
-  [TestCaseSource(nameof(ourAsyncSolutions))]
-  public void DoTest(KnownSolution solution)
-  {
+  [TestCaseSource(nameof(AsyncDefaultContexts))]
+  public void DoTest(ContextWithSolution context) =>
     ExecuteTestWithGold(
-      solution.CreateDefaultContext(),
-      events => ExecuteAsyncGroupingTest(events, solution));
-  }
+      context.Context,
+      events => ExecuteAsyncGroupingTest(events, context.Solution)
+    );
 
   private string ExecuteAsyncGroupingTest(CollectedEvents events, KnownSolution knownSolution)
   {

From ed2bd22e8036e06bfe1b5a349844e7710d77f27c Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sun, 3 May 2026 18:57:29 +0300
Subject: [PATCH 22/53] Meaningless refactorings

---
 Ficus/src/rust/ficus/src/pipelines/context.rs |  4 ++--
 .../ficus/tests/discovery/ecfg_discovery.rs   |  2 +-
 .../ficus_backend/src/grpc/backend_service.rs |  9 +++++----
 .../src/grpc/events/grpc_events_handler.rs    |  7 ++++---
 .../src/grpc/get_context_pipeline.rs          |  2 +-
 .../src/grpc/kafka/grpc_kafka_service.rs      | 14 ++++++-------
 .../src/grpc/kafka/kafka_service.rs           | 10 +++++-----
 .../ficus_backend/src/grpc/kafka/models.rs    |  8 ++++----
 .../ficus_backend/src/grpc/logs_handler.rs    |  4 ++--
 .../src/grpc/pipeline_executor.rs             | 20 +++++++++----------
 10 files changed, 41 insertions(+), 39 deletions(-)

diff --git a/Ficus/src/rust/ficus/src/pipelines/context.rs b/Ficus/src/rust/ficus/src/pipelines/context.rs
index 663040f7a..4decc5ca3 100644
--- a/Ficus/src/rust/ficus/src/pipelines/context.rs
+++ b/Ficus/src/rust/ficus/src/pipelines/context.rs
@@ -17,7 +17,7 @@ pub trait LogMessageHandler: Send + Sync {
 }
 
 pub struct PipelineInfrastructure {
-  log_message_handler: Option<Arc<Box<dyn LogMessageHandler>>>,
+  log_message_handler: Option<Arc<dyn LogMessageHandler>>,
 }
 
 impl PerformanceLogger<PipelinePartExecutionError> for PipelineInfrastructure {
@@ -28,7 +28,7 @@ impl PerformanceLogger<PipelinePartExecutionError> for PipelineInfrastructure {
 }
 
 impl PipelineInfrastructure {
-  pub fn new(log_message_handler: Option<Arc<Box<dyn LogMessageHandler>>>) -> Self {
+  pub fn new(log_message_handler: Option<Arc<dyn LogMessageHandler>>) -> Self {
     Self { log_message_handler }
   }
 
diff --git a/Ficus/src/rust/ficus/tests/discovery/ecfg_discovery.rs b/Ficus/src/rust/ficus/tests/discovery/ecfg_discovery.rs
index 160c94dd8..ec8134654 100644
--- a/Ficus/src/rust/ficus/tests/discovery/ecfg_discovery.rs
+++ b/Ficus/src/rust/ficus/tests/discovery/ecfg_discovery.rs
@@ -5,7 +5,7 @@ use ficus::{
     models::{EventWithUniqueId, RootSequenceKind},
     root_sequence::discover_root_sequence,
   },
-  utils::{references::HeapedOrOwned, user_data::user_data::UserDataImpl},
+  utils::user_data::user_data::UserDataImpl,
   vecs,
 };
 use std::rc::Rc;
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs
index c873ca495..c5dba9245 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs
@@ -33,7 +33,7 @@ pub(super) type GrpcSender = Sender<Result<GrpcPipelinePartExecutionResult, Stat
 
 pub struct FicusService {
   cv_service: Arc<ContextValueService>,
-  pipeline_parts: Arc<Box<PipelineParts>>,
+  pipeline_parts: Arc<PipelineParts>,
   contexts: Arc<Box<Mutex<HashMap<String, HashMap<String, Uuid>>>>>,
 }
 
@@ -41,7 +41,7 @@ impl FicusService {
   pub fn new(cv_service: Arc<ContextValueService>) -> Self {
     Self {
       cv_service,
-      pipeline_parts: Arc::new(Box::new(PipelineParts::new())),
+      pipeline_parts: Arc::new(PipelineParts::new()),
       contexts: Arc::new(Box::new(Mutex::new(HashMap::new()))),
     }
   }
@@ -49,7 +49,7 @@ impl FicusService {
 
 #[tonic::async_trait]
 impl GrpcBackendService for FicusService {
-  type ExecutePipelineStream = Pin<Box<dyn Stream<Item = Result<GrpcPipelinePartExecutionResult, Status>> + Send + Sync + 'static>>;
+  type ExecutePipelineStream = Pin<Box<dyn Stream<Item=Result<GrpcPipelinePartExecutionResult, Status>> + Send + Sync + 'static>>;
 
   async fn execute_pipeline(
     &self,
@@ -72,7 +72,8 @@ impl GrpcBackendService for FicusService {
     tokio::task::spawn_blocking(move || {
       let grpc_pipeline = request.get_ref().pipeline.as_ref().unwrap();
 
-      let sender = Arc::new(Box::new(GrpcPipelineEventsHandler::new(sender)) as Box<dyn PipelineEventsHandler>);
+      let sender = Arc::new(GrpcPipelineEventsHandler::new(sender));
+      let sender = sender as Arc<dyn PipelineEventsHandler>;
       let context = ServicePipelineExecutionContext::new(grpc_pipeline, &context_values, pipeline_parts, sender);
 
       match context.execute_grpc_pipeline(|_| Ok(())) {
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs b/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs
index 844c51068..d154439c0 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs
@@ -13,15 +13,16 @@ use crate::{
   },
 };
 use ficus::pipelines::context::LogMessageHandler;
+
 pub struct GrpcPipelineEventsHandler {
-  sender: Arc<Box<GrpcSender>>,
+  sender: Arc<GrpcSender>,
   console_logs_handler: ConsoleLogMessageHandler,
 }
 
 impl GrpcPipelineEventsHandler {
   pub fn new(sender: GrpcSender) -> Self {
     Self {
-      sender: Arc::new(Box::new(sender)),
+      sender: Arc::new(sender),
       console_logs_handler: ConsoleLogMessageHandler::new(),
     }
   }
@@ -45,7 +46,7 @@ impl PipelineEventsHandler for GrpcPipelineEventsHandler {
       return;
     }
 
-    send_grpc_message(self.sender.as_ref().as_ref(), &self.console_logs_handler, result);
+    send_grpc_message(self.sender.as_ref(), &self.console_logs_handler, result);
   }
 
   fn is_alive(&self) -> bool {
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/get_context_pipeline.rs b/Ficus/src/rust/ficus_backend/src/grpc/get_context_pipeline.rs
index a157899e3..cb29e17b8 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/get_context_pipeline.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/get_context_pipeline.rs
@@ -44,7 +44,7 @@ impl GetContextValuePipelinePart {
     keys: Vec<String>,
     uuid: Uuid,
     pipeline_part_name: String,
-    sender: Arc<Box<dyn PipelineEventsHandler>>,
+    sender: Arc<dyn PipelineEventsHandler>,
     before_part: Option<Box<DefaultPipelinePart>>,
   ) -> Box<GetContextValuePipelinePart> {
     Box::new(GetContextValuePipelinePart::new(
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
index 27a7a995d..0ad96b583 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
@@ -34,7 +34,7 @@ use uuid::Uuid;
 pub struct GrpcKafkaServiceImpl {
   cv_service: Arc<ContextValueService>,
   kafka_service: KafkaService,
-  pipeline_parts: Arc<Box<PipelineParts>>,
+  pipeline_parts: Arc<PipelineParts>,
 }
 
 impl GrpcKafkaServiceImpl {
@@ -42,7 +42,7 @@ impl GrpcKafkaServiceImpl {
     Self {
       cv_service: context_values_service,
       kafka_service: KafkaService::new(),
-      pipeline_parts: Arc::new(Box::new(PipelineParts::new())),
+      pipeline_parts: Arc::new(PipelineParts::new()),
     }
   }
 }
@@ -90,7 +90,7 @@ impl GrpcKafkaService for GrpcKafkaServiceImpl {
   }
 
   type AddPipelineToSubscriptionStreamStream =
-    Pin<Box<dyn Stream<Item = Result<GrpcPipelinePartExecutionResult, Status>> + Send + Sync + 'static>>;
+  Pin<Box<dyn Stream<Item=Result<GrpcPipelinePartExecutionResult, Status>> + Send + Sync + 'static>>;
 
   async fn add_pipeline_to_subscription_stream(
     &self,
@@ -171,7 +171,7 @@ impl GrpcKafkaService for GrpcKafkaServiceImpl {
   }
 
   type ExecutePipelineAndProduceToKafkaStream =
-    Pin<Box<dyn Stream<Item = Result<GrpcPipelinePartExecutionResult, Status>> + Send + Sync + 'static>>;
+  Pin<Box<dyn Stream<Item=Result<GrpcPipelinePartExecutionResult, Status>> + Send + Sync + 'static>>;
 
   async fn execute_pipeline_and_produce_to_kafka(
     &self,
@@ -182,9 +182,9 @@ impl GrpcKafkaService for GrpcKafkaServiceImpl {
     let kafka_handler = Box::new(kafka_handler) as Box<dyn PipelineEventsHandler>;
     let grpc_handler = Box::new(GrpcPipelineEventsHandler::new(sender)) as Box<dyn PipelineEventsHandler>;
 
-    let handler = Box::new(DelegatingEventsHandler::new(vec![kafka_handler, grpc_handler]));
-    let handler = handler as Box<dyn PipelineEventsHandler>;
-    let dto = PipelineExecutionDto::new(self.pipeline_parts.clone(), Arc::new(handler));
+    let handler = DelegatingEventsHandler::new(vec![kafka_handler, grpc_handler]);
+    let handler = Arc::new(handler) as Arc<dyn PipelineEventsHandler>;
+    let dto = PipelineExecutionDto::new(self.pipeline_parts.clone(), handler);
 
     let context_values = match self
       .cv_service
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
index ebceec3ab..64f3fb710 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
@@ -86,7 +86,7 @@ impl KafkaSubscription {
 }
 
 pub struct KafkaService {
-  pipeline_parts: Arc<Box<PipelineParts>>,
+  pipeline_parts: Arc<PipelineParts>,
   subscriptions_to_execution_requests: Arc<Mutex<HashMap<Uuid, KafkaSubscription>>>,
 
   logger: ConsoleLogMessageHandler,
@@ -95,7 +95,7 @@ pub struct KafkaService {
 impl KafkaService {
   pub fn new() -> Self {
     Self {
-      pipeline_parts: Arc::new(Box::new(PipelineParts::new())),
+      pipeline_parts: Arc::new(PipelineParts::new()),
       subscriptions_to_execution_requests: Arc::new(Mutex::new(HashMap::new())),
       logger: ConsoleLogMessageHandler::new(),
     }
@@ -229,8 +229,8 @@ impl KafkaService {
 
       let execution_result = context.execute_grpc_pipeline(move |context| {
         let execution_dto = PipelineExecutionDto::new(
-          Arc::new(Box::new(PipelineParts::new())),
-          Arc::new(Box::new(EmptyPipelineEventsHandler::new()) as Box<dyn PipelineEventsHandler>),
+          Arc::new(PipelineParts::new()),
+          Arc::new(EmptyPipelineEventsHandler::new()) as Arc<dyn PipelineEventsHandler>,
         );
 
         let trace_processing_context = KafkaTraceProcessingContext {
@@ -299,7 +299,7 @@ impl KafkaService {
     pipeline_name: String,
     streaming_config: StreamingConfiguration,
   ) -> KafkaSubscriptionPipeline {
-    let handler = Arc::new(Box::new(handler) as Box<dyn PipelineEventsHandler>);
+    let handler = Arc::new(handler) as Arc<dyn PipelineEventsHandler>;
     let dto = PipelineExecutionDto::new(self.pipeline_parts.clone(), handler);
     KafkaSubscriptionPipeline::new(request, dto, pipeline_name, streaming_config.create_processor())
   }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
index 5416efae9..10f892369 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
@@ -43,7 +43,7 @@ pub enum XesFromBxesKafkaTraceCreatingError {
 }
 
 impl Display for XesFromBxesKafkaTraceCreatingError {
-  fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+  fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
     let str = match self {
       XesFromBxesKafkaTraceCreatingError::BxesToXexConversionError(err) => err.to_string(),
       XesFromBxesKafkaTraceCreatingError::MetadataValueIsNotAString(key_name) => {
@@ -61,12 +61,12 @@ impl Display for XesFromBxesKafkaTraceCreatingError {
 
 #[derive(Clone)]
 pub struct PipelineExecutionDto {
-  pub(super) pipeline_parts: Arc<Box<PipelineParts>>,
-  pub(super) events_handler: Arc<Box<dyn PipelineEventsHandler>>,
+  pub(super) pipeline_parts: Arc<PipelineParts>,
+  pub(super) events_handler: Arc<dyn PipelineEventsHandler>,
 }
 
 impl PipelineExecutionDto {
-  pub fn new(pipeline_parts: Arc<Box<PipelineParts>>, events_handler: Arc<Box<dyn PipelineEventsHandler>>) -> Self {
+  pub fn new(pipeline_parts: Arc<PipelineParts>, events_handler: Arc<dyn PipelineEventsHandler>) -> Self {
     Self {
       pipeline_parts,
       events_handler,
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/logs_handler.rs b/Ficus/src/rust/ficus_backend/src/grpc/logs_handler.rs
index 26ad56754..32517b4d1 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/logs_handler.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/logs_handler.rs
@@ -5,7 +5,7 @@ use std::sync::Arc;
 use super::events::events_handler::{PipelineEvent, PipelineEventsHandler};
 
 pub struct GrpcLogMessageHandlerImpl {
-  sender: Arc<Box<dyn PipelineEventsHandler>>,
+  sender: Arc<dyn PipelineEventsHandler>,
 }
 
 impl LogMessageHandler for GrpcLogMessageHandlerImpl {
@@ -16,7 +16,7 @@ impl LogMessageHandler for GrpcLogMessageHandlerImpl {
 }
 
 impl GrpcLogMessageHandlerImpl {
-  pub fn new(sender: Arc<Box<dyn PipelineEventsHandler>>) -> Self {
+  pub fn new(sender: Arc<dyn PipelineEventsHandler>) -> Self {
     Self { sender }
   }
 }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/pipeline_executor.rs b/Ficus/src/rust/ficus_backend/src/grpc/pipeline_executor.rs
index 44fb34237..f3215e467 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/pipeline_executor.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/pipeline_executor.rs
@@ -23,17 +23,17 @@ use uuid::Uuid;
 pub(super) struct ServicePipelineExecutionContext<'a> {
   grpc_pipeline: &'a GrpcPipeline,
   context_values: &'a Vec<GrpcContextKeyValue>,
-  pipeline_parts: Arc<Box<PipelineParts>>,
-  handler: Arc<Box<dyn PipelineEventsHandler>>,
-  log_message_handler: Arc<Box<dyn LogMessageHandler>>,
+  pipeline_parts: Arc<PipelineParts>,
+  handler: Arc<dyn PipelineEventsHandler>,
+  log_message_handler: Arc<dyn LogMessageHandler>,
 }
 
 impl<'a> ServicePipelineExecutionContext<'a> {
   pub fn new(
     grpc_pipeline: &'a GrpcPipeline,
     context_values: &'a Vec<GrpcContextKeyValue>,
-    pipeline_parts: Arc<Box<PipelineParts>>,
-    handler: Arc<Box<dyn PipelineEventsHandler>>,
+    pipeline_parts: Arc<PipelineParts>,
+    handler: Arc<dyn PipelineEventsHandler>,
   ) -> Self {
     let log_message_handler = Self::create_log_message_handler(handler.clone());
 
@@ -46,7 +46,7 @@ impl<'a> ServicePipelineExecutionContext<'a> {
     }
   }
 
-  fn create_log_message_handler(sender: Arc<Box<dyn PipelineEventsHandler>>) -> Arc<Box<dyn LogMessageHandler>> {
+  fn create_log_message_handler(sender: Arc<dyn PipelineEventsHandler>) -> Arc<dyn LogMessageHandler> {
     let grpc_handler = GrpcLogMessageHandlerImpl::new(sender.clone());
     let grpc_handler = Box::new(grpc_handler) as Box<dyn LogMessageHandler>;
 
@@ -55,10 +55,10 @@ impl<'a> ServicePipelineExecutionContext<'a> {
 
     let delegating_handler = DelegatingLogMessageHandler::new(vec![grpc_handler, console_handler]);
 
-    Arc::new(Box::new(delegating_handler) as Box<dyn LogMessageHandler>)
+    Arc::new(delegating_handler) as Arc<dyn LogMessageHandler>
   }
 
-  pub fn sender(&self) -> Arc<Box<dyn PipelineEventsHandler>> {
+  pub fn sender(&self) -> Arc<dyn PipelineEventsHandler> {
     self.handler.clone()
   }
 
@@ -74,7 +74,7 @@ impl<'a> ServicePipelineExecutionContext<'a> {
     self.context_values
   }
 
-  pub fn log_message_handler(&self) -> Arc<Box<dyn LogMessageHandler>> {
+  pub fn log_message_handler(&self) -> Arc<dyn LogMessageHandler> {
     self.log_message_handler.clone()
   }
 
@@ -155,7 +155,7 @@ impl<'a> ServicePipelineExecutionContext<'a> {
     key_names: Vec<String>,
     uuid: Uuid,
     pipeline_part_name: String,
-    sender: &Arc<Box<dyn PipelineEventsHandler>>,
+    sender: &Arc<dyn PipelineEventsHandler>,
     before_part: Option<Box<DefaultPipelinePart>>,
   ) -> Box<GetContextValuePipelinePart> {
     let sender = sender.clone();

From dfb336514c2f1640bc282a7ccd48efb8c8285f06 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sun, 3 May 2026 20:58:10 +0300
Subject: [PATCH 23/53] Rename async tests gold

---
 .../net10.0/{TestAsyncAwait.gold => AsyncAwait.gold}              | 0
 ...syncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} | 0
 .../net10.0/{TestAsyncDisposable.gold => AsyncDisposable.gold}    | 0
 .../net10.0/{TestAwaitForeach.gold => AwaitForeach.gold}          | 0
 .../net10.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold}      | 0
 .../net10.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold}  | 0
 .../net8.0/{TestAsyncAwait.gold => AsyncAwait.gold}               | 0
 ...syncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} | 0
 .../net8.0/{TestAsyncDisposable.gold => AsyncDisposable.gold}     | 0
 .../net8.0/{TestAwaitForeach.gold => AwaitForeach.gold}           | 0
 .../net8.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold}       | 0
 .../net8.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold}   | 0
 .../net9.0/{TestAsyncAwait.gold => AsyncAwait.gold}               | 0
 ...syncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} | 0
 .../net9.0/{TestAsyncDisposable.gold => AsyncDisposable.gold}     | 0
 .../net9.0/{TestAwaitForeach.gold => AwaitForeach.gold}           | 0
 .../net9.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold}       | 0
 .../net9.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold}   | 0
 .../net10.0/{TestAsyncAwait.gold => AsyncAwait.gold}              | 0
 ...syncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} | 0
 .../net10.0/{TestAsyncDisposable.gold => AsyncDisposable.gold}    | 0
 .../net10.0/{TestAwaitForeach.gold => AwaitForeach.gold}          | 0
 .../net10.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold}      | 0
 .../net10.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold}  | 0
 .../net8.0/{TestAsyncAwait.gold => AsyncAwait.gold}               | 0
 ...syncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} | 0
 .../net8.0/{TestAsyncDisposable.gold => AsyncDisposable.gold}     | 0
 .../net8.0/{TestAwaitForeach.gold => AwaitForeach.gold}           | 0
 .../net8.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold}       | 0
 .../net8.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold}   | 0
 .../net9.0/{TestAsyncAwait.gold => AsyncAwait.gold}               | 0
 ...syncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} | 0
 .../net9.0/{TestAsyncDisposable.gold => AsyncDisposable.gold}     | 0
 .../net9.0/{TestAwaitForeach.gold => AwaitForeach.gold}           | 0
 .../net9.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold}       | 0
 .../net9.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold}   | 0
 .../net10.0/{TestAsyncAwait.gold => AsyncAwait.gold}              | 0
 ...syncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} | 0
 .../net10.0/{TestAsyncDisposable.gold => AsyncDisposable.gold}    | 0
 .../net10.0/{TestAwaitForeach.gold => AwaitForeach.gold}          | 0
 .../net10.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold}      | 0
 .../net10.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold}  | 0
 .../net8.0/{TestAsyncAwait.gold => AsyncAwait.gold}               | 0
 ...syncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} | 0
 .../net8.0/{TestAsyncDisposable.gold => AsyncDisposable.gold}     | 0
 .../net8.0/{TestAwaitForeach.gold => AwaitForeach.gold}           | 0
 .../net8.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold}       | 0
 .../net8.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold}   | 0
 .../net9.0/{TestAsyncAwait.gold => AsyncAwait.gold}               | 0
 ...syncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} | 0
 .../net9.0/{TestAsyncDisposable.gold => AsyncDisposable.gold}     | 0
 .../net9.0/{TestAwaitForeach.gold => AwaitForeach.gold}           | 0
 .../net9.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold}       | 0
 .../net9.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold}   | 0
 54 files changed, 0 insertions(+), 0 deletions(-)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/{TestAsyncAwait.gold => AsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/{TestAsyncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/{TestAsyncDisposable.gold => AsyncDisposable.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/{TestAwaitForeach.gold => AwaitForeach.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/{TestAsyncAwait.gold => AsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/{TestAsyncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/{TestAsyncDisposable.gold => AsyncDisposable.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/{TestAwaitForeach.gold => AwaitForeach.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/{TestAsyncAwait.gold => AsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/{TestAsyncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/{TestAsyncDisposable.gold => AsyncDisposable.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/{TestAwaitForeach.gold => AwaitForeach.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/{TestAsyncAwait.gold => AsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/{TestAsyncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/{TestAsyncDisposable.gold => AsyncDisposable.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/{TestAwaitForeach.gold => AwaitForeach.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/{TestAsyncAwait.gold => AsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/{TestAsyncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/{TestAsyncDisposable.gold => AsyncDisposable.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/{TestAwaitForeach.gold => AwaitForeach.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/{TestAsyncAwait.gold => AsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/{TestAsyncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/{TestAsyncDisposable.gold => AsyncDisposable.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/{TestAwaitForeach.gold => AwaitForeach.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/{TestAsyncAwait.gold => AsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/{TestAsyncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/{TestAsyncDisposable.gold => AsyncDisposable.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/{TestAwaitForeach.gold => AwaitForeach.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/{TestAsyncAwait.gold => AsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/{TestAsyncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/{TestAsyncDisposable.gold => AsyncDisposable.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/{TestAwaitForeach.gold => AwaitForeach.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/{TestAsyncAwait.gold => AsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/{TestAsyncAwaitTaskFactoryNew.gold => AsyncAwaitTaskFactoryNew.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/{TestAsyncDisposable.gold => AsyncDisposable.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/{TestAwaitForeach.gold => AwaitForeach.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/{TestNotSimpleAsync.gold => NotSimpleAsync.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/{TestSimpleAsyncAwait.gold => SimpleAsyncAwait.gold} (100%)

diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/AsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAsyncAwait.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/AsyncAwait.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/AsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/AsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/AsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAsyncDisposable.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/AsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/AwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestAwaitForeach.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/AwaitForeach.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/NotSimpleAsync.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestNotSimpleAsync.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/NotSimpleAsync.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/SimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/TestSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/SimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/AsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/AsyncAwait.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/AsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/AsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/AsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/AsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/AwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/AwaitForeach.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/NotSimpleAsync.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/NotSimpleAsync.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/SimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/SimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/AsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/AsyncAwait.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/AsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/AsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/AsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/AsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/AwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/AwaitForeach.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/NotSimpleAsync.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/NotSimpleAsync.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/SimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/SimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/AsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAsyncAwait.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/AsyncAwait.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/AsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/AsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/AsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAsyncDisposable.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/AsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/AwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestAwaitForeach.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/AwaitForeach.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/NotSimpleAsync.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestNotSimpleAsync.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/NotSimpleAsync.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/SimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/TestSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/SimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/AsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/AsyncAwait.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/AsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/AsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/AsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/AsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/AwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/AwaitForeach.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/NotSimpleAsync.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/NotSimpleAsync.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/SimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/SimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/AsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/AsyncAwait.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/AsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/AsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/AsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/AsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/AwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/AwaitForeach.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/NotSimpleAsync.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/NotSimpleAsync.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/SimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/SimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/AsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAsyncAwait.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/AsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/AsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/AsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/AsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAsyncDisposable.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/AsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/AwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestAwaitForeach.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/AwaitForeach.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/NotSimpleAsync.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestNotSimpleAsync.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/NotSimpleAsync.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/SimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/TestSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/SimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/AsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncAwait.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/AsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/AsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/AsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/AsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAsyncDisposable.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/AsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/AwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestAwaitForeach.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/AwaitForeach.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/NotSimpleAsync.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestNotSimpleAsync.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/NotSimpleAsync.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/SimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/TestSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/SimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/AsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncAwait.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/AsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/AsyncAwaitTaskFactoryNew.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncAwaitTaskFactoryNew.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/AsyncAwaitTaskFactoryNew.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/AsyncDisposable.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAsyncDisposable.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/AsyncDisposable.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/AwaitForeach.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestAwaitForeach.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/AwaitForeach.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/NotSimpleAsync.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestNotSimpleAsync.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/NotSimpleAsync.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/SimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/TestSimpleAsyncAwait.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/SimpleAsyncAwait.gold

From 6d6f3421dab007d5b480257bdc7be8f87c4c267a Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sun, 3 May 2026 22:29:09 +0300
Subject: [PATCH 24/53] Meaningless refactorings

---
 .../ficus_backend/src/grpc/backend_service.rs | 25 ++++-----
 .../src/grpc/kafka/grpc_kafka_service.rs      |  4 +-
 .../src/grpc/kafka/kafka_service.rs           | 51 ++++++++-----------
 3 files changed, 36 insertions(+), 44 deletions(-)

diff --git a/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs
index c5dba9245..0a00ea9c3 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs
@@ -49,7 +49,7 @@ impl FicusService {
 
 #[tonic::async_trait]
 impl GrpcBackendService for FicusService {
-  type ExecutePipelineStream = Pin<Box<dyn Stream<Item=Result<GrpcPipelinePartExecutionResult, Status>> + Send + Sync + 'static>>;
+  type ExecutePipelineStream = Pin<Box<dyn Stream<Item = Result<GrpcPipelinePartExecutionResult, Status>> + Send + Sync + 'static>>;
 
   async fn execute_pipeline(
     &self,
@@ -136,13 +136,14 @@ impl GrpcBackendService for FicusService {
   }
 
   async fn get_all_context_values(&self, request: Request<GrpcGuid>) -> Result<Response<GrpcGetAllContextValuesResult>, Status> {
-    let id = request.get_ref();
-    match self.contexts.lock().as_ref().unwrap().get(&id.guid) {
-      None => Err(Status::not_found("The context values for supplied execution id are not found")),
-      Some(keys_to_cv_ids) => Ok(Response::new(GrpcGetAllContextValuesResult {
-        context_values: keys_to_cv_ids.values().map(|id| GrpcGuid { guid: id.to_string() }).collect(),
-      })),
-    }
+    self.contexts.lock().as_ref().unwrap().get(&request.get_ref().guid).map_or_else(
+      || Err(Status::not_found("The context values for supplied execution id are not found")),
+      |ids| {
+        Ok(Response::new(GrpcGetAllContextValuesResult {
+          context_values: ids.values().map(|id| GrpcGuid { guid: id.to_string() }).collect(),
+        }))
+      },
+    )
   }
 
   async fn drop_execution_result(&self, request: Request<GrpcGuid>) -> Result<Response<()>, Status> {
@@ -150,10 +151,10 @@ impl GrpcBackendService for FicusService {
     let contexts = contexts.as_mut().ok().unwrap();
     let guid_str = &request.get_ref().guid;
 
-    match contexts.remove(guid_str) {
-      None => Err(Status::not_found(format!("The session for {} does not exist", guid_str))),
-      Some(_) => Ok(Response::new(())),
-    }
+    contexts.remove(guid_str).map_or_else(
+      || Err(Status::not_found(format!("The session for {} does not exist", guid_str))),
+      |_| Ok(Response::new(())),
+    )
   }
 
   async fn get_backend_info(&self, _: Request<()>) -> Result<Response<GrpcFicusBackendInfo>, Status> {
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
index 0ad96b583..33c92d70a 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
@@ -90,7 +90,7 @@ impl GrpcKafkaService for GrpcKafkaServiceImpl {
   }
 
   type AddPipelineToSubscriptionStreamStream =
-  Pin<Box<dyn Stream<Item=Result<GrpcPipelinePartExecutionResult, Status>> + Send + Sync + 'static>>;
+    Pin<Box<dyn Stream<Item = Result<GrpcPipelinePartExecutionResult, Status>> + Send + Sync + 'static>>;
 
   async fn add_pipeline_to_subscription_stream(
     &self,
@@ -171,7 +171,7 @@ impl GrpcKafkaService for GrpcKafkaServiceImpl {
   }
 
   type ExecutePipelineAndProduceToKafkaStream =
-  Pin<Box<dyn Stream<Item=Result<GrpcPipelinePartExecutionResult, Status>> + Send + Sync + 'static>>;
+    Pin<Box<dyn Stream<Item = Result<GrpcPipelinePartExecutionResult, Status>> + Send + Sync + 'static>>;
 
   async fn execute_pipeline_and_produce_to_kafka(
     &self,
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
index 64f3fb710..bcc540ea3 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
@@ -172,9 +172,9 @@ impl KafkaService {
   }
 
   fn create_consumer(request: &GrpcSubscribeToKafkaRequest) -> Result<BxesKafkaConsumer, KafkaError> {
-    let metadata = match request.connection_metadata.as_ref() {
-      None => return Err(KafkaError::Subscription("Kafka connection metadata was not provided".to_string())),
-      Some(metadata) => metadata,
+    let Some(metadata) = request.connection_metadata.as_ref() else {
+      const ERROR_MESSAGE: &str = "Kafka connection metadata was not provided";
+      return Err(KafkaError::Subscription(ERROR_MESSAGE.to_string()));
     };
 
     let mut config = ClientConfig::new();
@@ -209,9 +209,8 @@ impl KafkaService {
 
   fn process_kafka_trace(trace: BxesKafkaTrace, dto: &KafkaConsumerCreationDto) {
     let map = dto.subscriptions_to_execution_requests.lock().expect("Must acquire lock");
-    let kafka_subscription = match map.get(&dto.uuid) {
-      None => return,
-      Some(subscription) => subscription.clone(),
+    let Some(kafka_subscription) = map.get(&dto.uuid).cloned() else {
+      return;
     };
 
     drop(map);
@@ -239,16 +238,13 @@ impl KafkaService {
           trace,
         };
 
-        match pipeline.processor.observe(trace_processing_context) {
-          Ok(()) => {}
-          Err(err) => {
-            let message = format!("Failed to get update result, err: {}", err);
-            dto.logger.handle(message.as_str()).expect("Must log message");
-            return Err(PipelinePartExecutionError::Raw(RawPartExecutionError::new(
-              "Failed to mutate context".to_string(),
-            )));
-          }
-        };
+        if let Err(err) = pipeline.processor.observe(trace_processing_context) {
+          let message = format!("Failed to get update result, err: {}", err);
+          dto.logger.handle(message.as_str()).expect("Must log message");
+
+          let err = RawPartExecutionError::new("Failed to mutate context".to_string());
+          return Err(PipelinePartExecutionError::Raw(err));
+        }
 
         context.put_concrete(SUBSCRIPTION_ID_KEY.key(), dto.uuid);
         context.put_concrete(PIPELINE_ID_KEY.key(), *pipeline_id);
@@ -352,19 +348,14 @@ impl KafkaService {
   }
 
   pub(super) fn create_kafka_events_handler(producer_metadata: Option<&GrpcKafkaConnectionMetadata>) -> Result<KafkaEventsHandler, Status> {
-    let producer_metadata = match producer_metadata.as_ref() {
-      None => return Err(Status::invalid_argument("Producer metadata must be provided")),
-      Some(metadata) => metadata,
-    };
-
-    let producer = match PipelineEventsProducer::create(producer_metadata) {
-      Ok(producer) => producer,
-      Err(err) => {
-        let message = format!("Failed to create producer: {}", err);
-        return Err(Status::invalid_argument(message));
-      }
-    };
-
-    Ok(KafkaEventsHandler::new(producer))
+    producer_metadata
+      .ok_or_else(|| Status::invalid_argument("Producer metadata must be provided"))
+      .and_then(|metadata| match PipelineEventsProducer::create(metadata) {
+        Ok(producer) => Ok(KafkaEventsHandler::new(producer)),
+        Err(err) => {
+          let message = format!("Failed to create producer: {}", err);
+          Err(Status::invalid_argument(message))
+        }
+      })
   }
 }

From 0268c6763856beda65ea12a5cf82b41d5b514f00 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Sun, 3 May 2026 22:32:48 +0300
Subject: [PATCH 25/53] Rename some gold

---
 .../net10.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold}     | 0
 .../net8.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold}      | 0
 .../net9.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold}      | 0
 .../net10.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold}     | 0
 .../net8.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold}      | 0
 .../net9.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold}      | 0
 .../net10.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold}     | 0
 .../net8.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold}      | 0
 .../net9.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold}      | 0
 9 files changed, 0 insertions(+), 0 deletions(-)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold} (100%)
 rename Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/{NotSimpleAsync.gold => NotSimpleAsyncAwait.gold} (100%)

diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/NotSimpleAsync.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/NotSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/NotSimpleAsync.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net10.0/NotSimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/NotSimpleAsync.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/NotSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/NotSimpleAsync.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net8.0/NotSimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/NotSimpleAsync.gold b/Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/NotSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/NotSimpleAsync.gold
rename to Procfiler/test_data/gold/linux/AsyncMethodsGroupingTest/net9.0/NotSimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/NotSimpleAsync.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/NotSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/NotSimpleAsync.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net10.0/NotSimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/NotSimpleAsync.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/NotSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/NotSimpleAsync.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net8.0/NotSimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/NotSimpleAsync.gold b/Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/NotSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/NotSimpleAsync.gold
rename to Procfiler/test_data/gold/macos/AsyncMethodsGroupingTest/net9.0/NotSimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/NotSimpleAsync.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/NotSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/NotSimpleAsync.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net10.0/NotSimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/NotSimpleAsync.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/NotSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/NotSimpleAsync.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net8.0/NotSimpleAsyncAwait.gold
diff --git a/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/NotSimpleAsync.gold b/Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/NotSimpleAsyncAwait.gold
similarity index 100%
rename from Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/NotSimpleAsync.gold
rename to Procfiler/test_data/gold/windows/AsyncMethodsGroupingTest/net9.0/NotSimpleAsyncAwait.gold

From fcd5f004f8e406e4874a84e488a72e65276e790d Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Mon, 4 May 2026 22:56:04 +0300
Subject: [PATCH 26/53] Update models

---
 Ficus/protos/front_contract.proto | 18 ++++++++++--------
 Ficus/protos/kafka_service.proto  |  8 ++++++++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Ficus/protos/front_contract.proto b/Ficus/protos/front_contract.proto
index 7e7d392f1..49905de65 100644
--- a/Ficus/protos/front_contract.proto
+++ b/Ficus/protos/front_contract.proto
@@ -32,8 +32,16 @@ message GrpcGetPipelineCaseContextValuesRequest {
 
 message GrpcKafkaUpdate {
   GrpcProcessCaseMetadata processCaseMetadata = 1;
-  GrpcPipelinePartInfo pipelinePartInfo = 2;
-  repeated GrpcContextValueWithKeyName contextValues = 3;
+}
+
+message GrpcPipelinePartInfo {
+  string name = 1;
+  GrpcGuid id = 2;
+  GrpcGuid execution_id = 3;
+}
+
+message GrpcKafkaContextValues {
+  repeated GrpcContextValueWithKeyName contextValues = 1;
 }
 
 message GrpcProcessCaseMetadata {
@@ -65,9 +73,3 @@ message GrpcPipelinePartContextValues {
 message GrpcCasePipelinePartExecutionResult {
   repeated GrpcContextValueWithKeyName contextValues = 3;
 }
-
-message GrpcPipelinePartInfo {
-  string name = 1;
-  GrpcGuid id = 2;
-  GrpcGuid execution_id = 3;
-}
\ No newline at end of file
diff --git a/Ficus/protos/kafka_service.proto b/Ficus/protos/kafka_service.proto
index 25d948116..0c1ae53bf 100644
--- a/Ficus/protos/kafka_service.proto
+++ b/Ficus/protos/kafka_service.proto
@@ -13,6 +13,8 @@ service GrpcKafkaService {
   rpc SubscribeForKafkaTopic(GrpcSubscribeToKafkaRequest) returns (GrpcKafkaResult);
   rpc UnsubscribeFromKafkaTopic(GrpcUnsubscribeFromKafkaRequest) returns (GrpcKafkaResult);
 
+  rpc GetCurrentContextValues(GrpcGetCurrentContextValuesRequest) returns (GrpcGuid);
+
   rpc AddPipelineToSubscription(GrpcAddPipelineRequest) returns (GrpcKafkaResult);
   rpc AddPipelineToSubscriptionStream(GrpcAddPipelineStreamRequest) returns (stream GrpcPipelinePartExecutionResult);
 
@@ -24,6 +26,12 @@ service GrpcKafkaService {
   rpc ExecutePipelineAndProduceToKafka(GrpcExecutePipelineAndProduceKafkaRequest) returns (stream GrpcPipelinePartExecutionResult);
 }
 
+message GrpcGetCurrentContextValuesRequest {
+  GrpcGuid subscriptionId = 1;
+  GrpcGuid pipelineId = 2;
+  string processName = 3;
+}
+
 message GrpcExecutePipelineAndProduceKafkaRequest {
   GrpcProxyPipelineExecutionRequest pipelineRequest = 1;
   GrpcKafkaConnectionMetadata producerMetadata = 2;

From accb8b218e58393e79e89079c9ce154409f7d8da Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Mon, 4 May 2026 22:57:00 +0300
Subject: [PATCH 27/53] WIP on better kafka context values processing

---
 Ficus/src/rust/ficus_backend/Cargo.toml       |   2 +-
 .../ficus_backend/src/grpc/backend_service.rs |  85 +++--------
 .../src/grpc/context_values_service.rs        |  39 ++++-
 .../src/grpc/events/events_handler.rs         |   1 +
 .../src/grpc/events/grpc_events_handler.rs    |   5 +-
 .../src/grpc/events/kafka_events_handler.rs   |  49 +++----
 .../src/grpc/kafka/grpc_kafka_service.rs      |  31 ++--
 .../src/grpc/kafka/kafka_service.rs           | 134 ++++++++++--------
 .../ficus_backend/src/grpc/kafka/models.rs    | 101 +++++++++++++
 .../src/grpc/kafka/streaming/processors.rs    | 127 ++---------------
 .../src/grpc/kafka/streaming/t1/processors.rs |  39 +++--
 .../kafka/streaming/t2/dfg_data_structures.rs |  50 +++----
 .../src/grpc/kafka/streaming/t2/processors.rs |   6 +-
 .../src/grpc/pipeline_executor.rs             |  42 +++++-
 14 files changed, 371 insertions(+), 340 deletions(-)

diff --git a/Ficus/src/rust/ficus_backend/Cargo.toml b/Ficus/src/rust/ficus_backend/Cargo.toml
index b5b7fb8b0..e748c9f6a 100644
--- a/Ficus/src/rust/ficus_backend/Cargo.toml
+++ b/Ficus/src/rust/ficus_backend/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "ficus_backend"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 ficus = { path = "../ficus" }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs
index 0a00ea9c3..915a7a9fb 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs
@@ -4,29 +4,20 @@ use super::events::{
 };
 use crate::{
   ficus_proto::{
-    grpc_backend_service_server::GrpcBackendService, GrpcContextKey, GrpcContextKeyValue, GrpcFicusBackendInfo,
-    GrpcGetAllContextValuesResult, GrpcGetContextValueRequest, GrpcGuid, GrpcPipelinePartDescriptor, GrpcPipelinePartExecutionResult,
-    GrpcProxyPipelineExecutionRequest,
+    grpc_backend_service_server::GrpcBackendService, GrpcFicusBackendInfo, GrpcGetAllContextValuesResult, GrpcGetContextValueRequest, GrpcGuid,
+    GrpcPipelinePartDescriptor, GrpcPipelinePartExecutionResult, GrpcProxyPipelineExecutionRequest,
   },
-  grpc::{
-    context_values_service::ContextValueService, converters::convert_to_grpc_context_value,
-    pipeline_executor::ServicePipelineExecutionContext,
-  },
-};
-use ficus::{
-  pipelines::{keys::context_keys::find_context_key, pipeline_parts::PipelineParts},
-  utils::{context_key::DefaultContextKey, user_data::user_data::UserData},
+  grpc::{context_values_service::ContextValueService, pipeline_executor::ServicePipelineExecutionContext},
 };
+use ficus::pipelines::{keys::context_keys::find_context_key, pipeline_parts::PipelineParts};
 use futures::Stream;
 use std::{
-  collections::HashMap,
   pin::Pin,
-  sync::{Arc, Mutex},
+  sync::Arc,
 };
 use tokio::sync::mpsc::{self, Sender};
 use tokio_stream::wrappers::ReceiverStream;
 use tonic::{Request, Response, Status};
-use uuid::Uuid;
 
 pub(super) type GrpcResult = crate::ficus_proto::grpc_pipeline_part_execution_result::Result;
 pub(super) type GrpcSender = Sender<Result<GrpcPipelinePartExecutionResult, Status>>;
@@ -34,7 +25,6 @@ pub(super) type GrpcSender = Sender<Result<GrpcPipelinePartExecutionResult, Stat
 pub struct FicusService {
   cv_service: Arc<ContextValueService>,
   pipeline_parts: Arc<PipelineParts>,
-  contexts: Arc<Box<Mutex<HashMap<String, HashMap<String, Uuid>>>>>,
 }
 
 impl FicusService {
@@ -42,7 +32,6 @@ impl FicusService {
     Self {
       cv_service,
       pipeline_parts: Arc::new(PipelineParts::new()),
-      contexts: Arc::new(Box::new(Mutex::new(HashMap::new()))),
     }
   }
 }
@@ -56,7 +45,6 @@ impl GrpcBackendService for FicusService {
     request: Request<GrpcProxyPipelineExecutionRequest>,
   ) -> Result<Response<Self::ExecutePipelineStream>, Status> {
     let pipeline_parts = self.pipeline_parts.clone();
-    let contexts = self.contexts.clone();
     let (sender, receiver) = mpsc::channel(4);
 
     let context_values = match self.cv_service.reclaim_context_values(&request.get_ref().context_values_ids) {
@@ -76,33 +64,8 @@ impl GrpcBackendService for FicusService {
       let sender = sender as Arc<dyn PipelineEventsHandler>;
       let context = ServicePipelineExecutionContext::new(grpc_pipeline, &context_values, pipeline_parts, sender);
 
-      match context.execute_grpc_pipeline(|_| Ok(())) {
-        Ok((uuid, created_context)) => {
-          if let Some(items) = created_context.items() {
-            let mut ids = HashMap::new();
-
-            for (key, value) in items {
-              let context_key = DefaultContextKey::<()>::existing(key.id(), key.name().to_owned());
-
-              if let Some(grpc_cv) = convert_to_grpc_context_value(&context_key, value) {
-                let id = Uuid::new_v4();
-                cv_service.put_context_value(
-                  id.to_string(),
-                  GrpcContextKeyValue {
-                    key: Some(GrpcContextKey {
-                      name: key.name().to_owned(),
-                    }),
-                    value: Some(grpc_cv),
-                  },
-                );
-
-                ids.insert(key.name().to_owned(), id);
-              }
-            }
-
-            contexts.lock().as_mut().unwrap().insert(uuid.to_string(), ids);
-          }
-
+      match context.execute_grpc_pipeline_and_fill_context_values(|_| Ok(()), cv_service) {
+        Ok(uuid) => {
           context
             .sender()
             .handle(&PipelineEvent::FinalResult(PipelineFinalResult::Success(uuid)));
@@ -124,37 +87,25 @@ impl GrpcBackendService for FicusService {
       None => Err(Status::not_found(format!("Failed to find key for key name {}", key_name))),
       Some(key) => {
         let id = request.get_ref().execution_id.as_ref().unwrap();
-        match self.contexts.lock().as_mut().unwrap().get_mut(&id.guid) {
-          None => Err(Status::not_found("Failed to get context for guid".to_string())),
-          Some(keys_to_cv_ids) => match keys_to_cv_ids.get(key.key().name()) {
-            None => Err(Status::not_found("Failed to get context for guid".to_string())),
-            Some(id) => Ok(Response::new(GrpcGuid { guid: id.to_string() })),
-          },
-        }
+
+        self
+          .cv_service
+          .get_context_value(&id.guid, key.key().name().as_str())
+          .map(|id| Response::new(GrpcGuid { guid: id.to_string() }))
       }
     }
   }
 
   async fn get_all_context_values(&self, request: Request<GrpcGuid>) -> Result<Response<GrpcGetAllContextValuesResult>, Status> {
-    self.contexts.lock().as_ref().unwrap().get(&request.get_ref().guid).map_or_else(
-      || Err(Status::not_found("The context values for supplied execution id are not found")),
-      |ids| {
-        Ok(Response::new(GrpcGetAllContextValuesResult {
-          context_values: ids.values().map(|id| GrpcGuid { guid: id.to_string() }).collect(),
-        }))
-      },
-    )
+    self.cv_service.get_all_context_values(&request.get_ref().guid).map(|ids| {
+      Response::new(GrpcGetAllContextValuesResult {
+        context_values: ids.into_iter().map(|id| GrpcGuid { guid: id.to_string() }).collect(),
+      })
+    })
   }
 
   async fn drop_execution_result(&self, request: Request<GrpcGuid>) -> Result<Response<()>, Status> {
-    let mut contexts = self.contexts.lock();
-    let contexts = contexts.as_mut().ok().unwrap();
-    let guid_str = &request.get_ref().guid;
-
-    contexts.remove(guid_str).map_or_else(
-      || Err(Status::not_found(format!("The session for {} does not exist", guid_str))),
-      |_| Ok(Response::new(())),
-    )
+    self.cv_service.drop_execution_result(&request.get_ref().guid)
   }
 
   async fn get_backend_info(&self, _: Request<()>) -> Result<Response<GrpcFicusBackendInfo>, Status> {
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/context_values_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/context_values_service.rs
index 8d9c48d5e..2c5d8afad 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/context_values_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/context_values_service.rs
@@ -1,7 +1,7 @@
 use crate::{
   ficus_proto::{
-    grpc_context_values_service_server::GrpcContextValuesService, GrpcContextKey, GrpcContextKeyValue, GrpcContextValuePart,
-    GrpcDropContextValuesRequest, GrpcGuid,
+    GrpcContextKey, GrpcContextKeyValue, GrpcContextValuePart, GrpcDropContextValuesRequest, GrpcGuid,
+    grpc_context_values_service_server::GrpcContextValuesService,
   },
   grpc::converters::context_value_from_bytes,
 };
@@ -19,12 +19,14 @@ use uuid::Uuid;
 
 pub struct ContextValueService {
   context_values: Mutex<HashMap<String, GrpcContextKeyValue>>,
+  contexts: Mutex<HashMap<String, HashMap<String, Uuid>>>,
 }
 
 impl ContextValueService {
   pub fn new() -> Self {
     Self {
-      context_values: Mutex::new(HashMap::new()),
+      context_values: Default::default(),
+      contexts: Default::default(),
     }
   }
 
@@ -72,6 +74,37 @@ impl ContextValueService {
       )
     })
   }
+
+  pub fn insert_cv_to_ids(&self, id: Uuid, keys_to_ids: HashMap<String, Uuid>) {
+    self.contexts.lock().as_mut().unwrap().insert(id.to_string(), keys_to_ids);
+  }
+
+  pub fn drop_execution_result(&self, execution_id: &str) -> Result<Response<()>, Status> {
+    let mut contexts = self.contexts.lock();
+    let contexts = contexts.as_mut().ok().unwrap();
+
+    contexts.remove(execution_id).map_or_else(
+      || Err(Status::not_found(format!("The session for {} does not exist", execution_id))),
+      |_| Ok(Response::new(())),
+    )
+  }
+
+  pub fn get_all_context_values(&self, execution_id: &str) -> Result<Vec<String>, Status> {
+    self.contexts.lock().as_ref().unwrap().get(execution_id).map_or_else(
+      || Err(Status::not_found("The context values for supplied execution id are not found")),
+      |ids| Ok(ids.values().map(|id| id.to_string()).collect()),
+    )
+  }
+
+  pub fn get_context_value(&self, execution_id: &str, key: &str) -> Result<Uuid, Status> {
+    match self.contexts.lock().unwrap().get_mut(execution_id) {
+      None => Err(Status::not_found("Failed to get context for guid".to_string())),
+      Some(keys_to_cv_ids) => match keys_to_cv_ids.get(key) {
+        None => Err(Status::not_found("Failed to get context for guid".to_string())),
+        Some(id) => Ok(*id),
+      },
+    }
+  }
 }
 
 pub struct GrpcContextValueService {
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/events/events_handler.rs b/Ficus/src/rust/ficus_backend/src/grpc/events/events_handler.rs
index 9f9f3294b..fb4c9fe65 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/events/events_handler.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/events/events_handler.rs
@@ -42,4 +42,5 @@ pub enum PipelineEvent<'a> {
   GetContextValuesEvent(GetContextValuesEvent<'a>),
   LogMessage(String),
   FinalResult(PipelineFinalResult),
+  ProcessCaseMetadata(ProcessCaseMetadata),
 }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs b/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs
index d154439c0..688f3f1f0 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs
@@ -3,8 +3,8 @@ use std::sync::Arc;
 use super::events_handler::{GetContextValuesEvent, PipelineEvent, PipelineEventsHandler, PipelineFinalResult};
 use crate::{
   ficus_proto::{
-    grpc_pipeline_final_result::ExecutionResult, GrpcGuid, GrpcPipelineFinalResult, GrpcPipelinePartExecutionResult,
-    GrpcPipelinePartLogMessage, GrpcPipelinePartResult,
+    GrpcGuid, GrpcPipelineFinalResult, GrpcPipelinePartExecutionResult, GrpcPipelinePartLogMessage, GrpcPipelinePartResult,
+    grpc_pipeline_final_result::ExecutionResult,
   },
   grpc::{
     backend_service::{GrpcResult, GrpcSender},
@@ -37,6 +37,7 @@ impl PipelineEventsHandler for GrpcPipelineEventsHandler {
         PipelineFinalResult::Success(uuid) => ExecutionResult::Success(GrpcGuid { guid: uuid.to_string() }),
         PipelineFinalResult::Error(error_message) => ExecutionResult::Error(error_message.to_string()),
       }),
+      PipelineEvent::ProcessCaseMetadata(_) => unreachable!(),
     };
 
     if !self.is_alive() {
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/events/kafka_events_handler.rs b/Ficus/src/rust/ficus_backend/src/grpc/events/kafka_events_handler.rs
index 68dfad467..b48a6dcc9 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/events/kafka_events_handler.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/events/kafka_events_handler.rs
@@ -1,9 +1,9 @@
-use super::events_handler::{GetContextValuesEvent, PipelineEvent, PipelineEventsHandler, PipelineFinalResult};
+use super::events_handler::{PipelineEvent, PipelineEventsHandler, PipelineFinalResult};
 use crate::{
   ficus_proto::{
-    GrpcCaseName, GrpcGuid, GrpcKafkaConnectionMetadata, GrpcKafkaUpdate, GrpcPipelinePartInfo, GrpcProcessCaseMetadata, GrpcStringKeyValue,
+    GrpcCaseName, GrpcGuid, GrpcKafkaConnectionMetadata, GrpcKafkaUpdate, GrpcProcessCaseMetadata, GrpcStringKeyValue,
   },
-  grpc::{events::utils::create_grpc_context_values, logs_handler::ConsoleLogMessageHandler},
+  grpc::logs_handler::ConsoleLogMessageHandler,
 };
 use ficus::{features::cases::CaseName, pipelines::context::LogMessageHandler};
 use prost::Message;
@@ -73,16 +73,7 @@ impl KafkaEventsHandler {
 impl PipelineEventsHandler for KafkaEventsHandler {
   fn handle(&self, event: &PipelineEvent) {
     match event {
-      PipelineEvent::GetContextValuesEvent(event) => {
-        let result = self.producer.produce(event.to_grpc_kafka_update());
-
-        let message = match result {
-          Ok(_) => "Sent message to kafka".to_string(),
-          Err(err) => format!("Failed to produce event: {}", err),
-        };
-
-        self.console_logs_handler.handle(message.as_str()).expect("Should log message");
-      }
+      PipelineEvent::GetContextValuesEvent(_) => {}
       PipelineEvent::LogMessage(_) => {}
       PipelineEvent::FinalResult(result) => match result {
         PipelineFinalResult::Success(_) => {}
@@ -91,6 +82,18 @@ impl PipelineEventsHandler for KafkaEventsHandler {
           self.console_logs_handler.handle(message.as_str()).expect("Should log message");
         }
       },
+      PipelineEvent::ProcessCaseMetadata(event) => {
+        let result = self.producer.produce(GrpcKafkaUpdate {
+          process_case_metadata: Some(event.to_grpc_process_case_metadata()),
+        });
+
+        let message = match result {
+          Ok(_) => "Sent message to kafka".to_string(),
+          Err(err) => format!("Failed to produce event: {}", err),
+        };
+
+        self.console_logs_handler.handle(message.as_str()).expect("Should log message");
+      }
     };
   }
 
@@ -99,24 +102,6 @@ impl PipelineEventsHandler for KafkaEventsHandler {
   }
 }
 
-impl GetContextValuesEvent<'_> {
-  fn to_grpc_kafka_update(&self) -> GrpcKafkaUpdate {
-    GrpcKafkaUpdate {
-      process_case_metadata: Some(self.process_case_metadata.to_grpc_process_case_metadata()),
-      pipeline_part_info: Some(GrpcPipelinePartInfo {
-        id: Some(GrpcGuid {
-          guid: self.pipeline_part_id.to_string(),
-        }),
-        execution_id: Some(GrpcGuid {
-          guid: self.execution_id.to_string(),
-        }),
-        name: self.pipeline_part_name.clone(),
-      }),
-      context_values: create_grpc_context_values(&self.key_values),
-    }
-  }
-}
-
 pub struct ProcessCaseMetadata {
   pub case_name: CaseName,
   pub process_name: Rc<str>,
@@ -134,8 +119,8 @@ impl ProcessCaseMetadata {
         display_name: self.case_name.display_name.to_string(),
         full_name_parts: self.case_name.name_parts.iter().map(|p| p.to_string()).collect(),
       }),
-      process_name: self.process_name.to_string(),
 
+      process_name: self.process_name.to_string(),
       subscription_id: self.subscription_id.map(GrpcGuid::from),
       subscription_name: self.subscription_name.clone().map_or("".to_string(), |name| name.to_string()),
       pipeline_id: self.pipeline_id.map(GrpcGuid::from),
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
index 33c92d70a..03715e356 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
@@ -1,10 +1,11 @@
+use crate::ficus_proto::GrpcGetCurrentContextValuesRequest;
 use crate::{
   ficus_proto::{
-    grpc_kafka_result, grpc_kafka_service_server::GrpcKafkaService, GrpcAddPipelineRequest, GrpcAddPipelineStreamRequest,
-    GrpcExecutePipelineAndProduceKafkaRequest, GrpcGetAllSubscriptionsAndPipelinesResponse, GrpcGuid, GrpcKafkaFailedResult,
-    GrpcKafkaResult, GrpcKafkaSubscription, GrpcKafkaSubscriptionMetadata, GrpcKafkaSuccessResult, GrpcPipelineMetadata,
-    GrpcPipelinePartExecutionResult, GrpcRemoveAllPipelinesRequest, GrpcRemovePipelineRequest, GrpcSubscribeToKafkaRequest,
-    GrpcSubscriptionPipeline, GrpcUnsubscribeFromKafkaRequest,
+    GrpcAddPipelineRequest, GrpcAddPipelineStreamRequest, GrpcExecutePipelineAndProduceKafkaRequest,
+    GrpcGetAllSubscriptionsAndPipelinesResponse, GrpcGuid, GrpcKafkaFailedResult, GrpcKafkaResult, GrpcKafkaSubscription,
+    GrpcKafkaSubscriptionMetadata, GrpcKafkaSuccessResult, GrpcPipelineMetadata, GrpcPipelinePartExecutionResult,
+    GrpcRemoveAllPipelinesRequest, GrpcRemovePipelineRequest, GrpcSubscribeToKafkaRequest, GrpcSubscriptionPipeline,
+    GrpcUnsubscribeFromKafkaRequest, grpc_kafka_result, grpc_kafka_service_server::GrpcKafkaService,
   },
   grpc::{
     context_values_service::ContextValueService,
@@ -38,11 +39,12 @@ pub struct GrpcKafkaServiceImpl {
 }
 
 impl GrpcKafkaServiceImpl {
-  pub fn new(context_values_service: Arc<ContextValueService>) -> Self {
+  pub fn new(cv_service: Arc<ContextValueService>) -> Self {
+    let pipeline_parts = Arc::new(PipelineParts::default());
     Self {
-      cv_service: context_values_service,
-      kafka_service: KafkaService::new(),
-      pipeline_parts: Arc::new(PipelineParts::new()),
+      cv_service: cv_service.clone(),
+      kafka_service: KafkaService::new(pipeline_parts.clone(), cv_service),
+      pipeline_parts,
     }
   }
 }
@@ -78,6 +80,17 @@ impl GrpcKafkaService for GrpcKafkaServiceImpl {
     Ok(Response::new(GrpcKafkaResult { result: Some(result) }))
   }
 
+  async fn get_current_context_values(&self, request: Request<GrpcGetCurrentContextValuesRequest>) -> Result<Response<GrpcGuid>, Status> {
+    let pipeline_id = request.get_ref().pipeline_id.as_ref().unwrap().to_uuid()?;
+    let subscription_id = request.get_ref().subscription_id.as_ref().unwrap().to_uuid()?;
+    let process_name = request.get_ref().process_name.as_str();
+
+    self
+      .kafka_service
+      .get_context_values(pipeline_id, subscription_id, process_name)
+      .map(|id| Response::new(GrpcGuid { guid: id.to_string() }))
+  }
+
   async fn add_pipeline_to_subscription(&self, request: Request<GrpcAddPipelineRequest>) -> Result<Response<GrpcKafkaResult>, Status> {
     let dto = request.get_ref().to_dto();
     let handler = KafkaService::create_kafka_events_handler(request.get_ref().producer_kafka_metadata.as_ref())?;
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
index bcc540ea3..2dc8d4d4d 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
@@ -1,7 +1,10 @@
+use crate::grpc::context_values_service::ContextValueService;
+use crate::grpc::events::kafka_events_handler::ProcessCaseMetadata;
+use crate::grpc::kafka::models::ExtractedTraceMetadata;
 use crate::{
   ficus_proto::{
-    grpc_kafka_result, GrpcContextKeyValue, GrpcGuid, GrpcKafkaConnectionMetadata, GrpcKafkaFailedResult, GrpcKafkaSuccessResult,
-    GrpcPipeline, GrpcPipelineExecutionRequest, GrpcPipelineStreamingConfiguration, GrpcSubscribeToKafkaRequest,
+    GrpcContextKeyValue, GrpcGuid, GrpcKafkaConnectionMetadata, GrpcKafkaFailedResult, GrpcKafkaSuccessResult, GrpcPipeline,
+    GrpcPipelineExecutionRequest, GrpcPipelineStreamingConfiguration, GrpcSubscribeToKafkaRequest, grpc_kafka_result,
   },
   grpc::{
     events::{
@@ -20,17 +23,10 @@ use crate::{
   },
 };
 use bxes_kafka::consumer::bxes_kafka_consumer::{BxesKafkaConsumer, BxesKafkaError, BxesKafkaTrace};
-use ficus::{
-  pipelines::{
-    context::LogMessageHandler,
-    errors::pipeline_errors::{PipelinePartExecutionError, RawPartExecutionError},
-    keys::context_keys::{PIPELINE_ID_KEY, PIPELINE_NAME_KEY, SUBSCRIPTION_ID_KEY, SUBSCRIPTION_NAME_KEY},
-    pipeline_parts::PipelineParts,
-  },
-  utils::user_data::user_data::UserData,
-};
+use ficus::features::cases::CaseName;
+use ficus::pipelines::{context::LogMessageHandler, pipeline_parts::PipelineParts};
 use log::error;
-use rdkafka::{error::KafkaError, ClientConfig};
+use rdkafka::{ClientConfig, error::KafkaError};
 use std::{
   collections::HashMap,
   sync::{Arc, Mutex},
@@ -88,16 +84,17 @@ impl KafkaSubscription {
 pub struct KafkaService {
   pipeline_parts: Arc<PipelineParts>,
   subscriptions_to_execution_requests: Arc<Mutex<HashMap<Uuid, KafkaSubscription>>>,
-
+  cv_service: Arc<ContextValueService>,
   logger: ConsoleLogMessageHandler,
 }
 
 impl KafkaService {
-  pub fn new() -> Self {
+  pub fn new(pipeline_parts: Arc<PipelineParts>, cv_service: Arc<ContextValueService>) -> Self {
     Self {
-      pipeline_parts: Arc::new(PipelineParts::new()),
+      pipeline_parts,
       subscriptions_to_execution_requests: Arc::new(Mutex::new(HashMap::new())),
       logger: ConsoleLogMessageHandler::new(),
+      cv_service,
     }
   }
 }
@@ -151,17 +148,19 @@ impl KafkaService {
         return match err {
           BxesKafkaError::Kafka(err) => Err(err),
           BxesKafkaError::Bxes(_) => Err(KafkaError::Subscription("Failed to subscribe".to_string())),
-        }
+        };
       }
     }
 
     tokio::spawn(async move {
-      let handle = tokio::task::spawn_blocking(move || loop {
-        let should_stop = Self::execute_consumer_routine(&mut consumer, &dto);
-
-        if should_stop {
-          consumer.unsubscribe();
-          return;
+      let handle = tokio::task::spawn_blocking(move || {
+        loop {
+          let should_stop = Self::execute_consumer_routine(&mut consumer, &dto);
+
+          if should_stop {
+            consumer.unsubscribe();
+            return;
+          }
         }
       });
 
@@ -215,50 +214,71 @@ impl KafkaService {
 
     drop(map);
 
-    for pipeline in &kafka_subscription.pipelines {
-      let pipeline_id = pipeline.0;
-      let pipeline = pipeline.1;
-
-      if !pipeline.execution_dto.events_handler.is_alive() {
-        continue;
-      }
-
-      let context = Self::create_pipeline_execution_context(&pipeline.request, &pipeline.execution_dto);
+    for (pipeline_id, pipeline) in &kafka_subscription.pipelines {
       let trace = trace.clone();
+      let Ok(metadata) = ExtractedTraceMetadata::create_from(trace.metadata()) else {
+        continue;
+      };
+
+      let execution_dto = PipelineExecutionDto::new(
+        Arc::new(PipelineParts::new()),
+        Arc::new(EmptyPipelineEventsHandler::new()) as Arc<dyn PipelineEventsHandler>,
+      );
+
+      let trace_processing_context = KafkaTraceProcessingContext { execution_dto, trace };
+
+      if let Err(err) = pipeline.processor.observe(trace_processing_context) {
+        let message = format!("Failed to get update result, err: {}", err);
+        dto.logger.handle(message.as_str()).expect("Must log message");
+      } else {
+        let metadata = ProcessCaseMetadata {
+          pipeline_id: Some(*pipeline_id),
+          pipeline_name: Some(pipeline.name.clone().into()),
+          subscription_name: Some(dto.name.as_ref().into()),
+          subscription_id: Some(dto.uuid),
+          process_name: metadata.process.process_name,
+          metadata: metadata.unstructured_metadata,
+          case_name: CaseName {
+            display_name: metadata.case.case_display_name,
+            name_parts: metadata.case.case_name_parts,
+          },
+        };
 
-      let execution_result = context.execute_grpc_pipeline(move |context| {
-        let execution_dto = PipelineExecutionDto::new(
-          Arc::new(PipelineParts::new()),
-          Arc::new(EmptyPipelineEventsHandler::new()) as Arc<dyn PipelineEventsHandler>,
-        );
+        pipeline
+          .execution_dto
+          .events_handler
+          .handle(&PipelineEvent::ProcessCaseMetadata(metadata));
+      };
+    }
+  }
 
-        let trace_processing_context = KafkaTraceProcessingContext {
-          context,
-          execution_dto,
-          trace,
-        };
+  pub(super) fn get_context_values(&self, sub_id: Uuid, pipeline_id: Uuid, process_name: &str) -> Result<Uuid, Status> {
+    let map = self.subscriptions_to_execution_requests.lock().expect("Must acquire lock");
+    let Some(kafka_subscription) = map.get(&sub_id).cloned() else {
+      return Err(Status::not_found(format!("Failed to find subscription for id {sub_id}")));
+    };
 
-        if let Err(err) = pipeline.processor.observe(trace_processing_context) {
-          let message = format!("Failed to get update result, err: {}", err);
-          dto.logger.handle(message.as_str()).expect("Must log message");
+    drop(map);
 
-          let err = RawPartExecutionError::new("Failed to mutate context".to_string());
-          return Err(PipelinePartExecutionError::Raw(err));
-        }
+    let Some(pipeline) = kafka_subscription.pipelines.get(&pipeline_id) else {
+      return Err(Status::not_found(format!("Failed to find pipeline for id {sub_id}")));
+    };
 
-        context.put_concrete(SUBSCRIPTION_ID_KEY.key(), dto.uuid);
-        context.put_concrete(PIPELINE_ID_KEY.key(), *pipeline_id);
-        context.put_concrete(SUBSCRIPTION_NAME_KEY.key(), dto.name.as_ref().into());
-        context.put_concrete(PIPELINE_NAME_KEY.key(), pipeline.name.clone().into());
+    let execution_dto = PipelineExecutionDto::new(
+      Arc::new(PipelineParts::new()),
+      Arc::new(EmptyPipelineEventsHandler::new()) as Arc<dyn PipelineEventsHandler>,
+    );
 
+    let context = Self::create_pipeline_execution_context(&pipeline.request, &execution_dto);
+    let result = context.execute_grpc_pipeline_and_fill_context_values(
+      |context| {
+        pipeline.processor.fill_pipeline_context(context, process_name);
         Ok(())
-      });
+      },
+      self.cv_service.clone(),
+    );
 
-      if let Err(err) = execution_result {
-        let err = PipelineFinalResult::Error(err.to_string());
-        pipeline.execution_dto.events_handler.handle(&PipelineEvent::FinalResult(err));
-      }
-    }
+    result.map_err(|err| Status::internal(format!("Failed to execute pipeline, err: {}", err)))
   }
 }
 
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
index 10f892369..852b8a8ac 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
@@ -1,10 +1,12 @@
 use crate::grpc::{
   events::events_handler::PipelineEventsHandler, kafka::kafka_service::KafkaSubscription, logs_handler::ConsoleLogMessageHandler,
 };
+use bxes::models::domain::bxes_value::BxesValue;
 use ficus::{
   event_log::bxes::bxes_to_xes_converter::BxesToXesReadError,
   pipelines::{errors::pipeline_errors::PipelinePartExecutionError, pipeline_parts::PipelineParts},
 };
+use std::rc::Rc;
 use std::{
   collections::HashMap,
   fmt::{Debug, Display, Formatter},
@@ -92,3 +94,102 @@ impl KafkaConsumerCreationDto {
     }
   }
 }
+
+pub(super) struct ExtractedTraceMetadata {
+  pub process: ProcessMetadata,
+  pub case: CaseMetadata,
+  pub unstructured_metadata: Vec<(Rc<str>, Rc<str>)>,
+}
+
+impl ExtractedTraceMetadata {
+  pub fn create_from(metadata: &HashMap<Rc<str>, Rc<BxesValue>>) -> Result<Self, XesFromBxesKafkaTraceCreatingError> {
+    Ok(ExtractedTraceMetadata {
+      process: ProcessMetadata::create_from(metadata)?,
+      case: CaseMetadata::create_from(metadata)?,
+      unstructured_metadata: metadata_to_string_string_pairs(metadata),
+    })
+  }
+}
+
+pub(super) struct ProcessMetadata {
+  pub process_name: Rc<str>,
+}
+
+impl ProcessMetadata {
+  pub fn create_from(metadata: &HashMap<Rc<str>, Rc<BxesValue>>) -> Result<Self, XesFromBxesKafkaTraceCreatingError> {
+    let process_name = string_value_or_err(metadata, KAFKA_PROCESS_NAME)?;
+
+    Ok(Self { process_name })
+  }
+}
+
+pub(super) struct CaseMetadata {
+  pub case_id: Uuid,
+  pub case_display_name: Rc<str>,
+  pub case_name_parts: Vec<Rc<str>>,
+  pub case_name_parts_joined: Rc<str>,
+}
+
+impl CaseMetadata {
+  pub fn create_from(metadata: &HashMap<Rc<str>, Rc<BxesValue>>) -> Result<Self, XesFromBxesKafkaTraceCreatingError> {
+    let case_id = uuid_or_err(metadata, KAFKA_CASE_ID)?;
+    let case_name_parts_joined = string_value_or_err(metadata, KAFKA_CASE_NAME_PARTS)?;
+    let case_display_name = string_value_or_err(metadata, KAFKA_CASE_DISPLAY_NAME)?;
+    let case_name_parts: Vec<Rc<str>> = case_name_parts_joined
+      .split(KAFKA_CASE_NAME_PARTS_SEPARATOR)
+      .map(|s| s.to_string().into())
+      .collect();
+
+    Ok(Self {
+      case_id,
+      case_display_name,
+      case_name_parts,
+      case_name_parts_joined,
+    })
+  }
+}
+
+pub(super) fn string_value_or_err(
+  metadata: &HashMap<Rc<str>, Rc<BxesValue>>,
+  key_name: &str,
+) -> Result<Rc<str>, XesFromBxesKafkaTraceCreatingError> {
+  let value = value_or_err(metadata, key_name)?;
+
+  if let BxesValue::String(process_name) = value.as_ref() {
+    Ok(process_name.clone())
+  } else {
+    Err(XesFromBxesKafkaTraceCreatingError::MetadataValueIsNotAString(key_name.to_string()))
+  }
+}
+
+fn value_or_err(metadata: &HashMap<Rc<str>, Rc<BxesValue>>, key: &str) -> Result<Rc<BxesValue>, XesFromBxesKafkaTraceCreatingError> {
+  if let Some(value) = metadata.get(key) {
+    Ok(value.clone())
+  } else {
+    Err(XesFromBxesKafkaTraceCreatingError::MetadataValueNotFound(key.to_string()))
+  }
+}
+
+pub(super) fn uuid_or_err(metadata: &HashMap<Rc<str>, Rc<BxesValue>>, key: &str) -> Result<Uuid, XesFromBxesKafkaTraceCreatingError> {
+  let value = value_or_err(metadata, key)?;
+  if let BxesValue::Guid(id) = value.as_ref() {
+    Ok(*id)
+  } else {
+    Err(XesFromBxesKafkaTraceCreatingError::TraceIdIsNotUuid)
+  }
+}
+
+fn metadata_to_string_string_pairs(metadata: &HashMap<Rc<str>, Rc<BxesValue>>) -> Vec<(Rc<str>, Rc<str>)> {
+  metadata
+    .iter()
+    .filter_map(|pair| {
+      if pair.0.as_ref() == KAFKA_CASE_NAME_PARTS || pair.0.as_ref() == KAFKA_CASE_DISPLAY_NAME || pair.0.as_ref() == KAFKA_PROCESS_NAME {
+        None
+      } else if let BxesValue::String(value) = pair.1.as_ref() {
+        Some((pair.0.to_owned(), value.clone()))
+      } else {
+        None
+      }
+    })
+    .collect()
+}
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs
index 36a3df61a..9281eb175 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs
@@ -1,8 +1,6 @@
+use crate::grpc::kafka::models::ExtractedTraceMetadata;
 use crate::grpc::kafka::{
-  models::{
-    KafkaTraceProcessingError, PipelineExecutionDto, XesFromBxesKafkaTraceCreatingError, KAFKA_CASE_DISPLAY_NAME, KAFKA_CASE_ID,
-    KAFKA_CASE_NAME_PARTS, KAFKA_CASE_NAME_PARTS_SEPARATOR, KAFKA_PROCESS_NAME,
-  },
+  models::{KafkaTraceProcessingError, PipelineExecutionDto, XesFromBxesKafkaTraceCreatingError},
   streaming::{t1::processors::T1StreamingProcessor, t2::processors::T2StreamingProcessor},
 };
 use bxes::models::domain::bxes_value::BxesValue;
@@ -16,7 +14,6 @@ use ficus::{
   utils::user_data::user_data::UserData,
 };
 use std::{collections::HashMap, rc::Rc};
-use uuid::Uuid;
 
 #[derive(Clone)]
 pub enum TracesProcessor {
@@ -24,77 +21,24 @@ pub enum TracesProcessor {
   T2(T2StreamingProcessor),
 }
 
-pub struct KafkaTraceProcessingContext<'a, 'b> {
+pub struct KafkaTraceProcessingContext {
   pub trace: BxesKafkaTrace,
-  pub context: &'a mut PipelineContext<'b>,
   pub execution_dto: PipelineExecutionDto,
 }
 
 impl TracesProcessor {
   pub fn observe(&self, mut context: KafkaTraceProcessingContext) -> Result<(), KafkaTraceProcessingError> {
     match self {
-      TracesProcessor::T1(processor) => processor.observe(&context.trace, context.context),
+      TracesProcessor::T1(processor) => processor.observe(&context.trace),
       TracesProcessor::T2(processor) => processor.observe(&mut context),
-    }?;
-
-    match add_system_metadata(context.trace.metadata(), context.context) {
-      Ok(_) => Ok(()),
-      Err(err) => Err(KafkaTraceProcessingError::XesFromBxesTraceCreationError(err)),
     }
   }
-}
-
-pub(in crate::grpc::kafka::streaming) struct ProcessMetadata {
-  pub process_name: Rc<str>,
-}
-
-impl ProcessMetadata {
-  pub fn create_from(metadata: &HashMap<Rc<str>, Rc<BxesValue>>) -> Result<Self, XesFromBxesKafkaTraceCreatingError> {
-    let process_name = string_value_or_err(metadata, KAFKA_PROCESS_NAME)?;
-
-    Ok(Self { process_name })
-  }
-}
-
-pub(in crate::grpc::kafka::streaming) struct CaseMetadata {
-  pub case_id: Uuid,
-  pub case_display_name: Rc<str>,
-  pub case_name_parts: Vec<Rc<str>>,
-  pub case_name_parts_joined: Rc<str>,
-}
-
-impl CaseMetadata {
-  pub fn create_from(metadata: &HashMap<Rc<str>, Rc<BxesValue>>) -> Result<Self, XesFromBxesKafkaTraceCreatingError> {
-    let case_id = uuid_or_err(metadata, KAFKA_CASE_ID)?;
-    let case_name_parts_joined = string_value_or_err(metadata, KAFKA_CASE_NAME_PARTS)?;
-    let case_display_name = string_value_or_err(metadata, KAFKA_CASE_DISPLAY_NAME)?;
-    let case_name_parts: Vec<Rc<str>> = case_name_parts_joined
-      .split(KAFKA_CASE_NAME_PARTS_SEPARATOR)
-      .map(|s| s.to_string().into())
-      .collect();
-
-    Ok(Self {
-      case_id,
-      case_display_name,
-      case_name_parts,
-      case_name_parts_joined,
-    })
-  }
-}
-
-pub(in crate::grpc::kafka::streaming) struct ExtractedTraceMetadata {
-  pub process: ProcessMetadata,
-  pub case: CaseMetadata,
-  pub unstructured_metadata: Vec<(Rc<str>, Rc<str>)>,
-}
 
-impl ExtractedTraceMetadata {
-  pub fn create_from(metadata: &HashMap<Rc<str>, Rc<BxesValue>>) -> Result<Self, XesFromBxesKafkaTraceCreatingError> {
-    Ok(ExtractedTraceMetadata {
-      process: ProcessMetadata::create_from(metadata)?,
-      case: CaseMetadata::create_from(metadata)?,
-      unstructured_metadata: metadata_to_string_string_pairs(metadata),
-    })
+  pub fn fill_pipeline_context(&self, context: &mut PipelineContext, process_name: &str) {
+    match self {
+      TracesProcessor::T1(processor) => processor.fill_pipeline_context(context, process_name),
+      TracesProcessor::T2(processor) => processor.fill_pipeline_context(context, process_name),
+    }
   }
 }
 
@@ -116,56 +60,3 @@ fn add_system_metadata(
 
   Ok(())
 }
-
-pub(in crate::grpc::kafka::streaming) fn string_value_or_err(
-  metadata: &HashMap<Rc<str>, Rc<BxesValue>>,
-  key_name: &str,
-) -> Result<Rc<str>, XesFromBxesKafkaTraceCreatingError> {
-  let value = value_or_err(metadata, key_name)?;
-
-  if let BxesValue::String(process_name) = value.as_ref() {
-    Ok(process_name.clone())
-  } else {
-    Err(XesFromBxesKafkaTraceCreatingError::MetadataValueIsNotAString(key_name.to_string()))
-  }
-}
-
-pub(in crate::grpc::kafka::streaming) fn value_or_err(
-  metadata: &HashMap<Rc<str>, Rc<BxesValue>>,
-  key: &str,
-) -> Result<Rc<BxesValue>, XesFromBxesKafkaTraceCreatingError> {
-  if let Some(value) = metadata.get(key) {
-    Ok(value.clone())
-  } else {
-    Err(XesFromBxesKafkaTraceCreatingError::MetadataValueNotFound(key.to_string()))
-  }
-}
-
-pub(in crate::grpc::kafka::streaming) fn uuid_or_err(
-  metadata: &HashMap<Rc<str>, Rc<BxesValue>>,
-  key: &str,
-) -> Result<Uuid, XesFromBxesKafkaTraceCreatingError> {
-  let value = value_or_err(metadata, key)?;
-  if let BxesValue::Guid(id) = value.as_ref() {
-    Ok(*id)
-  } else {
-    Err(XesFromBxesKafkaTraceCreatingError::TraceIdIsNotUuid)
-  }
-}
-
-pub(in crate::grpc::kafka::streaming) fn metadata_to_string_string_pairs(
-  metadata: &HashMap<Rc<str>, Rc<BxesValue>>,
-) -> Vec<(Rc<str>, Rc<str>)> {
-  metadata
-    .iter()
-    .filter_map(|pair| {
-      if pair.0.as_ref() == KAFKA_CASE_NAME_PARTS || pair.0.as_ref() == KAFKA_CASE_DISPLAY_NAME || pair.0.as_ref() == KAFKA_PROCESS_NAME {
-        None
-      } else if let BxesValue::String(value) = pair.1.as_ref() {
-        Some((pair.0.to_owned(), value.clone()))
-      } else {
-        None
-      }
-    })
-    .collect()
-}
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
index 477997c43..96e6cfad1 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
@@ -1,23 +1,19 @@
+use crate::grpc::kafka::models::{string_value_or_err, uuid_or_err};
 use crate::grpc::{
-  kafka::{
-    models::{KafkaTraceProcessingError, XesFromBxesKafkaTraceCreatingError, KAFKA_CASE_ID, KAFKA_CASE_NAME_PARTS, KAFKA_TRACE_ID},
-    streaming::processors::{string_value_or_err, uuid_or_err},
-  },
+  kafka::models::{KAFKA_CASE_ID, KAFKA_CASE_NAME_PARTS, KAFKA_TRACE_ID, KafkaTraceProcessingError, XesFromBxesKafkaTraceCreatingError},
   logs_handler::ConsoleLogMessageHandler,
 };
 use bxes_kafka::consumer::bxes_kafka_consumer::BxesKafkaTrace;
+use ficus::pipelines::keys::context_keys::EVENT_LOG_KEY;
+use ficus::utils::user_data::user_data::UserData;
 use ficus::{
   event_log::{
     bxes::bxes_to_xes_converter::read_bxes_events,
     core::{event::event::EventPayloadValue, event_log::EventLog, trace::trace::Trace},
-    xes::{xes_event_log::XesEventLogImpl},
+    xes::xes_event_log::XesEventLogImpl,
   },
   features::streaming::t1::filterers::T1LogFilterer,
-  pipelines::{
-    context::{LogMessageHandler, PipelineContext},
-    keys::context_keys::EVENT_LOG_KEY,
-  },
-  utils::user_data::user_data::UserData,
+  pipelines::context::{LogMessageHandler, PipelineContext},
 };
 use log::info;
 use std::{
@@ -44,13 +40,9 @@ impl T1StreamingProcessor {
     }
   }
 
-  pub fn observe(&self, trace: &BxesKafkaTrace, context: &mut PipelineContext) -> Result<(), KafkaTraceProcessingError> {
+  pub fn observe(&self, trace: &BxesKafkaTrace) -> Result<(), KafkaTraceProcessingError> {
     match self.update_log(trace) {
-      Ok(new_log) => {
-        context.put_concrete(EVENT_LOG_KEY.key(), new_log);
-
-        Ok(())
-      }
+      Ok(_) => Ok(()),
       Err(err) => {
         let message = format!("Failed to get update result, err: {}", err);
         self.logger.handle(message.as_str()).expect("Must log message");
@@ -58,10 +50,17 @@ impl T1StreamingProcessor {
       }
     }
   }
+
+  pub fn fill_pipeline_context(&self, context: &mut PipelineContext, process_name: &str) {
+    let names_to_log = self.names_to_logs.lock().unwrap();
+    if let Some(log) = names_to_log.get(process_name).cloned() {
+      context.put_concrete(EVENT_LOG_KEY.key(), log);
+    }
+  }
 }
 
 impl T1StreamingProcessor {
-  fn update_log(&self, trace: &BxesKafkaTrace) -> Result<XesEventLogImpl, XesFromBxesKafkaTraceCreatingError> {
+  fn update_log(&self, trace: &BxesKafkaTrace) -> Result<(), XesFromBxesKafkaTraceCreatingError> {
     let case_id = uuid_or_err(trace.metadata(), KAFKA_CASE_ID)?;
     let case_name_parts_joined = string_value_or_err(trace.metadata(), KAFKA_CASE_NAME_PARTS)?;
 
@@ -73,7 +72,7 @@ impl T1StreamingProcessor {
     trace: &BxesKafkaTrace,
     trace_id: Uuid,
     case_key: &str,
-  ) -> Result<XesEventLogImpl, XesFromBxesKafkaTraceCreatingError> {
+  ) -> Result<(), XesFromBxesKafkaTraceCreatingError> {
     let mut names_to_logs = self.names_to_logs.lock();
     let names_to_logs = match names_to_logs.as_mut() {
       Ok(names_to_logs) => names_to_logs,
@@ -105,7 +104,7 @@ impl T1StreamingProcessor {
           }
 
           drop(existing_xes_trace);
-          return Ok(existing_log.clone());
+          return Ok(());
         }
       }
     }
@@ -119,6 +118,6 @@ impl T1StreamingProcessor {
 
     info!("Created new trace for trace id {}", trace_id);
 
-    Ok(existing_log.clone())
+    Ok(())
   }
 }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
index 3ec61f65b..6961f5a57 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
@@ -1,24 +1,17 @@
-use crate::grpc::kafka::{
-  models::XesFromBxesKafkaTraceCreatingError,
-  streaming::processors::{CaseMetadata, ProcessMetadata},
-};
+use crate::grpc::kafka::models::XesFromBxesKafkaTraceCreatingError;
+use crate::grpc::kafka::models::{CaseMetadata, ProcessMetadata};
 use bxes::models::domain::bxes_value::BxesValue;
-use ficus::{
-  event_log::{
-    core::{event::event::Event, trace::trace::Trace},
-    xes::xes_trace::XesTraceImpl,
-  },
-  features::{
-    analysis::log_info::event_log_info::OfflineEventLogInfo,
-    streaming::counters::{
-      core::{StreamingCounter, ValueUpdateKind},
-      lossy_count::LossyCount,
-      sliding_window::SlidingWindow,
-    },
-  },
-  pipelines::{context::PipelineContext, keys::context_keys::EVENT_LOG_INFO_KEY},
-  utils::user_data::user_data::UserData,
-};
+use ficus::event_log::core::event::event::Event;
+use ficus::event_log::core::trace::trace::Trace;
+use ficus::event_log::xes::xes_trace::XesTraceImpl;
+use ficus::features::analysis::log_info::event_log_info::OfflineEventLogInfo;
+use ficus::features::streaming::counters::core::StreamingCounter;
+use ficus::features::streaming::counters::core::ValueUpdateKind;
+use ficus::features::streaming::counters::lossy_count::LossyCount;
+use ficus::features::streaming::counters::sliding_window::SlidingWindow;
+use ficus::pipelines::context::PipelineContext;
+use ficus::pipelines::keys::context_keys::EVENT_LOG_INFO_KEY;
+use ficus::utils::user_data::user_data::UserData;
 use log::{debug, warn};
 use std::{cell::RefCell, collections::HashMap, hash::Hash, rc::Rc, time::Duration};
 use uuid::Uuid;
@@ -96,7 +89,7 @@ impl DfgDataStructureBase {
       .map(|value| value.value().unwrap().clone())
   }
 
-  pub fn to_event_log_info(&self, process_name: &Rc<str>) -> Option<OfflineEventLogInfo> {
+  pub fn to_event_log_info(&self, process_name: &str) -> Option<OfflineEventLogInfo> {
     let event_classes_count = match self.event_classes_count.get(process_name) {
       None => return None,
       Some(classes) => classes.borrow().to_freq_count_map().into_iter().map(|(k, v)| (k, v.1)).collect(),
@@ -166,7 +159,6 @@ impl DfgDataStructures {
     &mut self,
     metadata: &HashMap<Rc<str>, Rc<BxesValue>>,
     xes_trace: &XesTraceImpl,
-    context: &mut PipelineContext,
   ) -> Result<(), XesFromBxesKafkaTraceCreatingError> {
     if xes_trace.events().is_empty() {
       return Ok(());
@@ -198,6 +190,14 @@ impl DfgDataStructures {
       .base
       .observe_last_trace_class(case_metadata.case_id.to_owned(), new_trace_last_class.clone());
 
+    Ok(())
+  }
+
+  pub fn invalidate(&mut self) {
+    self.base.invalidate();
+  }
+
+  pub fn fill_pipeline_context(&self, context: &mut PipelineContext, process_name: &str) {
     match self.base.to_event_log_info(process_name) {
       None => {
         warn!("Failed to create offline event log info")
@@ -206,11 +206,5 @@ impl DfgDataStructures {
         context.put_concrete(EVENT_LOG_INFO_KEY.key(), log_info);
       }
     }
-
-    Ok(())
-  }
-
-  pub fn invalidate(&mut self) {
-    self.base.invalidate();
   }
 }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/processors.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/processors.rs
index 04827c707..020d7312a 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/processors.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/processors.rs
@@ -92,9 +92,13 @@ impl T2StreamingProcessor {
 
     dfg_data_structure.invalidate();
 
-    match dfg_data_structure.process_bxes_trace(context.trace.metadata(), &xes_trace, context.context) {
+    match dfg_data_structure.process_bxes_trace(context.trace.metadata(), &xes_trace) {
       Ok(()) => Ok(()),
       Err(err) => Err(KafkaTraceProcessingError::XesFromBxesTraceCreationError(err)),
     }
   }
+
+  pub fn fill_pipeline_context(&self, context: &mut PipelineContext, process_name: &str) {
+    self.dfg_data_structure.lock().unwrap().fill_pipeline_context(context, process_name);
+  }
 }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/pipeline_executor.rs b/Ficus/src/rust/ficus_backend/src/grpc/pipeline_executor.rs
index f3215e467..509d5927e 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/pipeline_executor.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/pipeline_executor.rs
@@ -1,22 +1,27 @@
 use super::events::events_handler::PipelineEventsHandler;
+use crate::ficus_proto::GrpcContextKey;
+use crate::grpc::context_values_service::ContextValueService;
+use crate::grpc::converters::convert_to_grpc_context_value;
 use crate::{
-  ficus_proto::{grpc_pipeline_part_base::Part, GrpcContextKeyValue, GrpcPipeline, GrpcPipelinePart},
+  ficus_proto::{GrpcContextKeyValue, GrpcPipeline, GrpcPipelinePart, grpc_pipeline_part_base::Part},
   grpc::{
     converters::put_into_user_data,
     get_context_pipeline::GetContextValuePipelinePart,
     logs_handler::{ConsoleLogMessageHandler, DelegatingLogMessageHandler, GrpcLogMessageHandlerImpl},
   },
 };
+use ficus::utils::context_key::DefaultContextKey;
 use ficus::{
   pipelines::{
     context::{LogMessageHandler, PipelineContext, PipelineInfrastructure},
     errors::pipeline_errors::PipelinePartExecutionError,
-    keys::context_keys::{find_context_key, EXECUTION_ID_KEY},
+    keys::context_keys::{EXECUTION_ID_KEY, find_context_key},
     pipeline_parts::PipelineParts,
     pipelines::{DefaultPipelinePart, Pipeline, PipelinePart},
   },
   utils::user_data::user_data::{UserData, UserDataImpl},
 };
+use std::collections::HashMap;
 use std::{str::FromStr, sync::Arc};
 use uuid::Uuid;
 
@@ -108,6 +113,39 @@ impl<'a> ServicePipelineExecutionContext<'a> {
     }
   }
 
+  pub(super) fn execute_grpc_pipeline_and_fill_context_values(
+    &self,
+    context_mutator: impl FnOnce(&mut PipelineContext) -> Result<(), PipelinePartExecutionError>,
+    cv_service: Arc<ContextValueService>,
+  ) -> Result<Uuid, PipelinePartExecutionError> {
+    let (uuid, created_context) = self.execute_grpc_pipeline(context_mutator)?;
+    let Some(items) = created_context.items() else { return Ok(uuid) };
+
+    let mut ids = HashMap::new();
+    for (key, value) in items {
+      let context_key = DefaultContextKey::<()>::existing(key.id(), key.name().to_owned());
+
+      if let Some(grpc_cv) = convert_to_grpc_context_value(&context_key, value) {
+        let id = Uuid::new_v4();
+        cv_service.put_context_value(
+          id.to_string(),
+          GrpcContextKeyValue {
+            key: Some(GrpcContextKey {
+              name: key.name().to_owned(),
+            }),
+            value: Some(grpc_cv),
+          },
+        );
+
+        ids.insert(key.name().to_owned(), id);
+      }
+    }
+
+    cv_service.insert_cv_to_ids(uuid, ids);
+
+    Ok(uuid)
+  }
+
   pub(super) fn to_pipeline(&self) -> Pipeline {
     let mut pipeline = Pipeline::default();
     for grpc_part in &self.grpc_pipeline().parts {

From f2d37665c08c51aac41a3c1cc3d6a8559adefdbf Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Tue, 5 May 2026 00:01:39 +0300
Subject: [PATCH 28/53] Move context values related rpcs to
 GrpcContextValuesService

---
 Ficus/protos/backend_service.proto            | 14 --------
 Ficus/protos/context_values_service.proto     | 14 +++++++-
 .../ficus_backend/src/grpc/backend_service.rs | 34 +++----------------
 .../src/grpc/context_values_service.rs        | 25 ++++++++++++++
 4 files changed, 42 insertions(+), 45 deletions(-)

diff --git a/Ficus/protos/backend_service.proto b/Ficus/protos/backend_service.proto
index 9fb67dec7..93d4ecce1 100644
--- a/Ficus/protos/backend_service.proto
+++ b/Ficus/protos/backend_service.proto
@@ -23,12 +23,7 @@ message GrpcPipelinePartToBackends {
 
 service GrpcBackendService {
   rpc ExecutePipeline(GrpcProxyPipelineExecutionRequest) returns (stream GrpcPipelinePartExecutionResult);
-
-  rpc GetContextValue(GrpcGetContextValueRequest) returns (GrpcGuid);
-  rpc GetAllContextValues(GrpcGuid) returns (GrpcGetAllContextValuesResult);
-
   rpc DropExecutionResult(GrpcGuid) returns (google.protobuf.Empty);
-
   rpc GetBackendInfo(google.protobuf.Empty) returns (GrpcFicusBackendInfo);
 }
 
@@ -41,11 +36,6 @@ message GrpcPipelinePartDescriptor {
   string name = 1;
 }
 
-message GrpcGetContextValueRequest {
-  GrpcGuid executionId = 2;
-  GrpcContextKey key = 1;
-}
-
 message GrpcPipelineExecutionRequest {
   GrpcPipeline pipeline = 1;
   repeated GrpcContextKeyValue initialContext = 2;
@@ -79,7 +69,3 @@ message GrpcPipelineFinalResult {
     string error = 2;
   }
 }
-
-message GrpcGetAllContextValuesResult {
-  repeated GrpcGuid context_values = 1;
-}
\ No newline at end of file
diff --git a/Ficus/protos/context_values_service.proto b/Ficus/protos/context_values_service.proto
index 365449b98..a0abaf4aa 100644
--- a/Ficus/protos/context_values_service.proto
+++ b/Ficus/protos/context_values_service.proto
@@ -12,6 +12,9 @@ service GrpcContextValuesService {
   rpc SetContextValue(stream GrpcContextValuePart) returns (GrpcGuid);
   rpc GetContextValue(GrpcGuid) returns (stream GrpcContextValuePart);
   rpc DropContextValues(GrpcDropContextValuesRequest) returns (google.protobuf.Empty);
+
+  rpc GetContextValueId(GrpcGetContextValueRequest) returns (GrpcGuid);
+  rpc GetAllContextValuesIds(GrpcGuid) returns (GrpcGetAllContextValuesResult);
 }
 
 message GrpcContextValuePart {
@@ -21,4 +24,13 @@ message GrpcContextValuePart {
 
 message GrpcDropContextValuesRequest {
   repeated GrpcGuid ids = 1;
-}
\ No newline at end of file
+}
+
+message GrpcGetContextValueRequest {
+  GrpcGuid executionId = 2;
+  GrpcContextKey key = 1;
+}
+
+message GrpcGetAllContextValuesResult {
+  repeated GrpcGuid context_values = 1;
+}
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs
index 915a7a9fb..befa2ab13 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/backend_service.rs
@@ -4,17 +4,14 @@ use super::events::{
 };
 use crate::{
   ficus_proto::{
-    grpc_backend_service_server::GrpcBackendService, GrpcFicusBackendInfo, GrpcGetAllContextValuesResult, GrpcGetContextValueRequest, GrpcGuid,
-    GrpcPipelinePartDescriptor, GrpcPipelinePartExecutionResult, GrpcProxyPipelineExecutionRequest,
+    GrpcFicusBackendInfo, GrpcGuid, GrpcPipelinePartDescriptor, GrpcPipelinePartExecutionResult, GrpcProxyPipelineExecutionRequest,
+    grpc_backend_service_server::GrpcBackendService,
   },
   grpc::{context_values_service::ContextValueService, pipeline_executor::ServicePipelineExecutionContext},
 };
-use ficus::pipelines::{keys::context_keys::find_context_key, pipeline_parts::PipelineParts};
+use ficus::pipelines::pipeline_parts::PipelineParts;
 use futures::Stream;
-use std::{
-  pin::Pin,
-  sync::Arc,
-};
+use std::{pin::Pin, sync::Arc};
 use tokio::sync::mpsc::{self, Sender};
 use tokio_stream::wrappers::ReceiverStream;
 use tonic::{Request, Response, Status};
@@ -81,29 +78,6 @@ impl GrpcBackendService for FicusService {
     Ok(Response::new(Box::pin(ReceiverStream::new(receiver))))
   }
 
-  async fn get_context_value(&self, request: Request<GrpcGetContextValueRequest>) -> Result<Response<GrpcGuid>, Status> {
-    let key_name = &request.get_ref().key.as_ref().unwrap().name;
-    match find_context_key(key_name) {
-      None => Err(Status::not_found(format!("Failed to find key for key name {}", key_name))),
-      Some(key) => {
-        let id = request.get_ref().execution_id.as_ref().unwrap();
-
-        self
-          .cv_service
-          .get_context_value(&id.guid, key.key().name().as_str())
-          .map(|id| Response::new(GrpcGuid { guid: id.to_string() }))
-      }
-    }
-  }
-
-  async fn get_all_context_values(&self, request: Request<GrpcGuid>) -> Result<Response<GrpcGetAllContextValuesResult>, Status> {
-    self.cv_service.get_all_context_values(&request.get_ref().guid).map(|ids| {
-      Response::new(GrpcGetAllContextValuesResult {
-        context_values: ids.into_iter().map(|id| GrpcGuid { guid: id.to_string() }).collect(),
-      })
-    })
-  }
-
   async fn drop_execution_result(&self, request: Request<GrpcGuid>) -> Result<Response<()>, Status> {
     self.cv_service.drop_execution_result(&request.get_ref().guid)
   }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/context_values_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/context_values_service.rs
index 2c5d8afad..4588cfcaa 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/context_values_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/context_values_service.rs
@@ -1,3 +1,4 @@
+use crate::ficus_proto::{GrpcGetAllContextValuesResult, GrpcGetContextValueRequest};
 use crate::{
   ficus_proto::{
     GrpcContextKey, GrpcContextKeyValue, GrpcContextValuePart, GrpcDropContextValuesRequest, GrpcGuid,
@@ -5,6 +6,7 @@ use crate::{
   },
   grpc::converters::context_value_from_bytes,
 };
+use ficus::pipelines::keys::context_keys::find_context_key;
 use futures::Stream;
 use prost::Message;
 use std::{
@@ -179,6 +181,29 @@ impl GrpcContextValuesService for GrpcContextValueService {
     }
   }
 
+  async fn get_context_value_id(&self, request: Request<GrpcGetContextValueRequest>) -> Result<Response<GrpcGuid>, Status> {
+    let key_name = &request.get_ref().key.as_ref().unwrap().name;
+    match find_context_key(key_name) {
+      None => Err(Status::not_found(format!("Failed to find key for key name {}", key_name))),
+      Some(key) => {
+        let id = request.get_ref().execution_id.as_ref().unwrap();
+
+        self
+          .cv_service
+          .get_context_value(&id.guid, key.key().name().as_str())
+          .map(|id| Response::new(GrpcGuid { guid: id.to_string() }))
+      }
+    }
+  }
+
+  async fn get_all_context_values_ids(&self, request: Request<GrpcGuid>) -> Result<Response<GrpcGetAllContextValuesResult>, Status> {
+    self.cv_service.get_all_context_values(&request.get_ref().guid).map(|ids| {
+      Response::new(GrpcGetAllContextValuesResult {
+        context_values: ids.into_iter().map(|id| GrpcGuid { guid: id.to_string() }).collect(),
+      })
+    })
+  }
+
   async fn drop_context_values(&self, request: Request<GrpcDropContextValuesRequest>) -> Result<Response<()>, Status> {
     self.cv_service.prune_context_values(&request.get_ref().ids);
 

From c406b297731bdef1c7103ca4c5c0b507b3f86d43 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Tue, 5 May 2026 00:59:17 +0300
Subject: [PATCH 29/53] Use simple streams for now

---
 Ficus/protos/backend_service.proto            |   2 +
 Ficus/protos/kafka_service.proto              |   2 +-
 .../IPipelinePartsUpdatesRepository.cs        | 127 +++++++-----------
 .../Utils/SemaphoreSlimExtensions.cs          |   4 +-
 .../src/grpc/events/grpc_events_handler.rs    |   4 +
 .../src/grpc/kafka/grpc_kafka_service.rs      |  33 +++--
 .../src/grpc/kafka/kafka_service.rs           |  16 ++-
 7 files changed, 93 insertions(+), 95 deletions(-)

diff --git a/Ficus/protos/backend_service.proto b/Ficus/protos/backend_service.proto
index 93d4ecce1..9d5d1b68f 100644
--- a/Ficus/protos/backend_service.proto
+++ b/Ficus/protos/backend_service.proto
@@ -61,6 +61,8 @@ message GrpcPipelinePartLogMessage {
 message GrpcPipelinePartResult {
   repeated GrpcContextValueWithKeyName contextValues = 1;
   GrpcGuid guid = 2;
+  string pipeline_part_name = 3;
+  GrpcGuid pipeline_part_id = 4;
 }
 
 message GrpcPipelineFinalResult {
diff --git a/Ficus/protos/kafka_service.proto b/Ficus/protos/kafka_service.proto
index 0c1ae53bf..0bf0943f5 100644
--- a/Ficus/protos/kafka_service.proto
+++ b/Ficus/protos/kafka_service.proto
@@ -13,7 +13,7 @@ service GrpcKafkaService {
   rpc SubscribeForKafkaTopic(GrpcSubscribeToKafkaRequest) returns (GrpcKafkaResult);
   rpc UnsubscribeFromKafkaTopic(GrpcUnsubscribeFromKafkaRequest) returns (GrpcKafkaResult);
 
-  rpc GetCurrentContextValues(GrpcGetCurrentContextValuesRequest) returns (GrpcGuid);
+  rpc GetCurrentContextValues(GrpcGetCurrentContextValuesRequest) returns (stream GrpcPipelinePartExecutionResult);
 
   rpc AddPipelineToSubscription(GrpcAddPipelineRequest) returns (GrpcKafkaResult);
   rpc AddPipelineToSubscriptionStream(GrpcAddPipelineStreamRequest) returns (stream GrpcPipelinePartExecutionResult);
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/IPipelinePartsUpdatesRepository.cs b/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/IPipelinePartsUpdatesRepository.cs
index 83223a862..873b7c2a7 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/IPipelinePartsUpdatesRepository.cs
+++ b/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/IPipelinePartsUpdatesRepository.cs
@@ -13,33 +13,18 @@ public interface IPipelinePartsUpdatesRepository
   Task ProcessUpdate(GrpcKafkaUpdate update);
 }
 
-public class PipelinePartsUpdatesRepository(ILogger<PipelinePartsUpdatesRepository> logger) : IPipelinePartsUpdatesRepository
+public class PipelinePartsUpdatesRepository(
+  ILogger<PipelinePartsUpdatesRepository> logger,
+  GrpcKafkaService.GrpcKafkaServiceClient kafkaClient
+) : IPipelinePartsUpdatesRepository
 {
-  private class PipelinePartExecutionResult
-  {
-    public required List<GrpcContextValueWithKeyName> ContextValues { get; init; }
-  }
-
-  private class PipelinePartExecutionResults
-  {
-    public required string PipelinePartName { get; init; }
-    public required List<PipelinePartExecutionResult> Results { get; init; }
-  }
-
-  private class PipelinePartsExecutionResults
-  {
-    public required Guid ExecutionId { get; set; }
-    public required ulong Stamp { get; set; }
-    public required Dictionary<Guid, PipelinePartExecutionResults> PipelinePartsResults { get; init; }
-  }
-
   private class CaseData
   {
-    public required PipelinePartsExecutionResults ExecutionResults { get; init; }
     public required List<KeyValuePair<string, string>> Metadata { get; init; }
 
     public required string PipelineName { get; init; }
     public required string SubscriptionName { get; init; }
+    public required ulong Stamp { get; set; }
   }
 
   private record CaseName(string DisplayName, List<string> NameParts)
@@ -79,7 +64,7 @@ public Task<GrpcSubscriptionAndPipelinesStateResponse> GetCurrentState()
       {
         response.Cases.Add(new GrpcProcessCaseMetadataWithStamp()
         {
-          Stamp = @case.ExecutionResults.Stamp,
+          Stamp = @case.Stamp,
           Metadata = new GrpcProcessCaseMetadata
           {
             ProcessName = caseKey.ProcessName,
@@ -104,11 +89,11 @@ public Task<GrpcSubscriptionAndPipelinesStateResponse> GetCurrentState()
         });
       }
 
-      return Task.FromResult(response);
+      return response;
     });
   }
 
-  public Task<GrpcCaseContextValues> GetCaseContextValues(GrpcGetPipelineCaseContextValuesRequest request)
+  public async Task<GrpcCaseContextValues> GetCaseContextValues(GrpcGetPipelineCaseContextValuesRequest request)
   {
     var key = new CaseKey(
       request.SubscriptionId.ToGuid(),
@@ -120,37 +105,55 @@ public Task<GrpcCaseContextValues> GetCaseContextValues(GrpcGetPipelineCaseConte
       )
     );
 
-    return myLock.Execute(() =>
+    var stream = kafkaClient.GetCurrentContextValues(new GrpcGetCurrentContextValuesRequest
+    {
+      PipelineId = request.PipelineId,
+      ProcessName = request.ProcessName,
+      SubscriptionId = request.SubscriptionId,
+    });
+
+    var executionId = Guid.NewGuid();
+    var executionResults = new List<GrpcPipelinePartContextValues>();
+    while (await stream.ResponseStream.MoveNext(CancellationToken.None))
+    {
+      var current = stream.ResponseStream.Current;
+      if (current.ResultCase == GrpcPipelinePartExecutionResult.ResultOneofCase.PipelinePartResult)
+      {
+        executionResults.Add(new GrpcPipelinePartContextValues
+        {
+          ExecutionResults =
+          {
+            new GrpcCasePipelinePartExecutionResult
+            {
+              ContextValues = { current.PipelinePartResult.ContextValues }
+            }
+          },
+          Stamp = DateTime.UtcNow.ToTimestamp(),
+          PipelinePartInfo = new GrpcPipelinePartInfo
+          {
+            ExecutionId = executionId.ToGrpcGuid(),
+            Id = current.PipelinePartResult.PipelinePartId,
+            Name = current.PipelinePartResult.PipelinePartName,
+          }
+        });
+      }
+    }
+
+    return await myLock.Execute(() =>
     {
       if (!myCases.TryGetValue(key, out var caseData))
       {
         throw new KeyNotFoundException();
       }
 
-      return Task.FromResult(new GrpcCaseContextValues
+      return new GrpcCaseContextValues
       {
-        Stamp = caseData.ExecutionResults.Stamp,
+        Stamp = caseData.Stamp,
         ContextValues =
         {
-          caseData.ExecutionResults.PipelinePartsResults.Select(x => new GrpcPipelinePartContextValues
-          {
-            Stamp = Timestamp.FromDateTime(DateTime.UtcNow),
-            ExecutionResults =
-            {
-              x.Value.Results.Select(e => new GrpcCasePipelinePartExecutionResult
-              {
-                ContextValues = { e.ContextValues }
-              })
-            },
-            PipelinePartInfo = new GrpcPipelinePartInfo
-            {
-              ExecutionId = caseData.ExecutionResults.ExecutionId.ToGrpcGuid(),
-              Name = x.Value.PipelinePartName,
-              Id = x.Key.ToGrpcGuid()
-            }
-          })
+          executionResults
         }
-      });
+      };
     });
   }
 
@@ -176,20 +179,14 @@ public Task ProcessUpdate(GrpcKafkaUpdate update)
         )
       );
 
-      var currentExecutionId = update.PipelinePartInfo.ExecutionId.ToGuid();
       if (!myCases.TryGetValue(caseKey, out var caseData))
       {
         logger.LogInformation("Creating new process data for update");
 
         caseData = new CaseData
         {
+          Stamp = 0,
           Metadata = update.ProcessCaseMetadata.Metadata.Select(kv => new KeyValuePair<string, string>(kv.Key, kv.Value)).ToList(),
-          ExecutionResults = new PipelinePartsExecutionResults
-          {
-            ExecutionId = currentExecutionId,
-            PipelinePartsResults = [],
-            Stamp = 0
-          },
           PipelineName = update.ProcessCaseMetadata.PipelineName,
           SubscriptionName = update.ProcessCaseMetadata.SubscriptionName
         };
@@ -197,33 +194,7 @@ public Task ProcessUpdate(GrpcKafkaUpdate update)
         myCases[caseKey] = caseData;
       }
 
-      var guid = Guid.Parse(update.PipelinePartInfo.Id.Guid);
-
-      if (caseData.ExecutionResults.ExecutionId != currentExecutionId)
-      {
-        logger.LogInformation("Resetting all execution results after execution id changed");
-        caseData.ExecutionResults.ExecutionId = currentExecutionId;
-        caseData.ExecutionResults.PipelinePartsResults.Clear();
-      }
-
-      if (!caseData.ExecutionResults.PipelinePartsResults.TryGetValue(guid, out var pipelinePartResults))
-      {
-        logger.LogInformation("Creating new cases context values");
-        pipelinePartResults = new PipelinePartExecutionResults
-        {
-          PipelinePartName = update.PipelinePartInfo.Name,
-          Results = []
-        };
-
-        caseData.ExecutionResults.PipelinePartsResults[guid] = pipelinePartResults;
-      }
-
-      pipelinePartResults.Results.Add(new PipelinePartExecutionResult
-      {
-        ContextValues = update.ContextValues.ToList(),
-      });
-
-      caseData.ExecutionResults.Stamp++;
+      caseData.Stamp++;
       return Task.CompletedTask;
     });
   }
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Utils/SemaphoreSlimExtensions.cs b/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Utils/SemaphoreSlimExtensions.cs
index 5a8980f05..6fe41bbe9 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Utils/SemaphoreSlimExtensions.cs
+++ b/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Utils/SemaphoreSlimExtensions.cs
@@ -17,12 +17,12 @@ public async Task Execute(Func<Task> action)
       }
     }
 
-    public async Task<T> Execute<T>(Func<Task<T>> action)
+    public async Task<T> Execute<T>(Func<T> action)
     {
       try
       {
         await semaphoreSlim.WaitAsync();
-        return await action();
+        return action();
       }
       finally
       {
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs b/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs
index 688f3f1f0..d78e63379 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs
@@ -63,6 +63,10 @@ impl GrpcPipelineEventsHandler {
           guid: event.pipeline_part_id.to_string(),
         }),
         context_values: create_grpc_context_values(&event.key_values),
+        pipeline_part_name: event.pipeline_part_name.clone(),
+        pipeline_part_id: Some(GrpcGuid {
+          guid: event.execution_id.to_string(),
+        }),
       })),
     }
   }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
index 03715e356..6b34a7af5 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
@@ -34,7 +34,7 @@ use uuid::Uuid;
 
 pub struct GrpcKafkaServiceImpl {
   cv_service: Arc<ContextValueService>,
-  kafka_service: KafkaService,
+  kafka_service: Arc<KafkaService>,
   pipeline_parts: Arc<PipelineParts>,
 }
 
@@ -43,7 +43,7 @@ impl GrpcKafkaServiceImpl {
     let pipeline_parts = Arc::new(PipelineParts::default());
     Self {
       cv_service: cv_service.clone(),
-      kafka_service: KafkaService::new(pipeline_parts.clone(), cv_service),
+      kafka_service: Arc::new(KafkaService::new(pipeline_parts.clone(), cv_service)),
       pipeline_parts,
     }
   }
@@ -80,15 +80,32 @@ impl GrpcKafkaService for GrpcKafkaServiceImpl {
     Ok(Response::new(GrpcKafkaResult { result: Some(result) }))
   }
 
-  async fn get_current_context_values(&self, request: Request<GrpcGetCurrentContextValuesRequest>) -> Result<Response<GrpcGuid>, Status> {
+  type GetCurrentContextValuesStream = Self::ExecutePipelineAndProduceToKafkaStream;
+
+  async fn get_current_context_values(
+    &self,
+    request: Request<GrpcGetCurrentContextValuesRequest>,
+  ) -> Result<Response<Self::ExecutePipelineAndProduceToKafkaStream>, Status> {
     let pipeline_id = request.get_ref().pipeline_id.as_ref().unwrap().to_uuid()?;
     let subscription_id = request.get_ref().subscription_id.as_ref().unwrap().to_uuid()?;
-    let process_name = request.get_ref().process_name.as_str();
+    let process_name = request.get_ref().process_name.clone();
 
-    self
-      .kafka_service
-      .get_context_values(pipeline_id, subscription_id, process_name)
-      .map(|id| Response::new(GrpcGuid { guid: id.to_string() }))
+    let (sender, receiver) = mpsc::channel(4);
+    let grpc_handler = Arc::new(GrpcPipelineEventsHandler::new(sender));
+    let kafka_service = self.kafka_service.clone();
+
+    tokio::task::spawn_blocking(move || {
+      match kafka_service.get_context_values(pipeline_id, subscription_id, &process_name, grpc_handler.clone()) {
+        Ok(uuid) => {
+          grpc_handler.handle(&PipelineEvent::FinalResult(PipelineFinalResult::Success(uuid)));
+        }
+        Err(err) => {
+          grpc_handler.handle(&PipelineEvent::FinalResult(PipelineFinalResult::Error(err.to_string())));
+        }
+      };
+    });
+
+    Ok(Response::new(Box::pin(ReceiverStream::new(receiver))))
   }
 
   async fn add_pipeline_to_subscription(&self, request: Request<GrpcAddPipelineRequest>) -> Result<Response<GrpcKafkaResult>, Status> {
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
index 2dc8d4d4d..16468b6e9 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
@@ -1,4 +1,5 @@
 use crate::grpc::context_values_service::ContextValueService;
+use crate::grpc::events::grpc_events_handler::GrpcPipelineEventsHandler;
 use crate::grpc::events::kafka_events_handler::ProcessCaseMetadata;
 use crate::grpc::kafka::models::ExtractedTraceMetadata;
 use crate::{
@@ -252,7 +253,13 @@ impl KafkaService {
     }
   }
 
-  pub(super) fn get_context_values(&self, sub_id: Uuid, pipeline_id: Uuid, process_name: &str) -> Result<Uuid, Status> {
+  pub(super) fn get_context_values(
+    &self,
+    sub_id: Uuid,
+    pipeline_id: Uuid,
+    process_name: &str,
+    handler: Arc<GrpcPipelineEventsHandler>,
+  ) -> Result<Uuid, Status> {
     let map = self.subscriptions_to_execution_requests.lock().expect("Must acquire lock");
     let Some(kafka_subscription) = map.get(&sub_id).cloned() else {
       return Err(Status::not_found(format!("Failed to find subscription for id {sub_id}")));
@@ -264,11 +271,8 @@ impl KafkaService {
       return Err(Status::not_found(format!("Failed to find pipeline for id {sub_id}")));
     };
 
-    let execution_dto = PipelineExecutionDto::new(
-      Arc::new(PipelineParts::new()),
-      Arc::new(EmptyPipelineEventsHandler::new()) as Arc<dyn PipelineEventsHandler>,
-    );
-
+    let handler = handler as Arc<dyn PipelineEventsHandler>;
+    let execution_dto = PipelineExecutionDto::new(Arc::new(PipelineParts::new()), handler);
     let context = Self::create_pipeline_execution_context(&pipeline.request, &execution_dto);
     let result = context.execute_grpc_pipeline_and_fill_context_values(
       |context| {

From 514ed7febb7edca4ded0081e6e068b607423874b Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Tue, 5 May 2026 01:09:38 +0300
Subject: [PATCH 30/53] Make tests compile

---
 .../FicusKafkaIntegrationTests.cs             | 23 +++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/Ficus/test/IntegrationTests/IntegrationTests/FicusKafkaIntegrationTests.cs b/Ficus/test/IntegrationTests/IntegrationTests/FicusKafkaIntegrationTests.cs
index 0d59446a1..742f34008 100644
--- a/Ficus/test/IntegrationTests/IntegrationTests/FicusKafkaIntegrationTests.cs
+++ b/Ficus/test/IntegrationTests/IntegrationTests/FicusKafkaIntegrationTests.cs
@@ -8,6 +8,7 @@
 using Ficus;
 using FicusKafkaConstants;
 using FicusKafkaIntegration;
+using Grpc.Core.Utils;
 using IntegrationTests.Base;
 using Microsoft.Extensions.Logging;
 
@@ -41,7 +42,7 @@ public void SameTraceIdTest()
     AssertNamesLogMatchesMergedOriginal(eventLog, ConsumeAllUpdates(eventLog.Traces.Count));
   }
 
-  private static void AssertNamesLogMatchesMergedOriginal(IEventLog eventLog, IReadOnlyList<GrpcKafkaUpdate> updates)
+  private void AssertNamesLogMatchesMergedOriginal(IEventLog eventLog, IReadOnlyList<GrpcKafkaUpdate> updates)
   {
     var namesLog = FindLastNamesLog(updates);
 
@@ -55,7 +56,7 @@ private static void AssertNamesLogMatchesMergedOriginal(IEventLog eventLog, IRea
     }
   }
 
-  private static void AssertNamesLogMatchesOriginal(IEventLog eventLog, IReadOnlyList<GrpcKafkaUpdate> updates)
+  private void AssertNamesLogMatchesOriginal(IEventLog eventLog, IReadOnlyList<GrpcKafkaUpdate> updates)
   {
     Assert.That(eventLog.Traces, Has.Count.EqualTo(updates.Count));
 
@@ -70,8 +71,22 @@ private static void AssertNamesLogMatchesOriginal(IEventLog eventLog, IReadOnlyL
     }
   }
 
-  private static GrpcContextValueWithKeyName FindLastNamesLog(IReadOnlyList<GrpcKafkaUpdate> updates) =>
-    updates.Last().ContextValues.First(c => c.Value.ContextValueCase is GrpcContextValue.ContextValueOneofCase.NamesLog);
+  private GrpcContextValueWithKeyName FindLastNamesLog(IReadOnlyList<GrpcKafkaUpdate> updates)
+  {
+    var lastUpdate = updates.Last();
+    var stream = KafkaClient.GetCurrentContextValues(new GrpcGetCurrentContextValuesRequest
+    {
+      PipelineId = lastUpdate.ProcessCaseMetadata.PipelineId,
+      ProcessName = lastUpdate.ProcessCaseMetadata.ProcessName,
+      SubscriptionId = lastUpdate.ProcessCaseMetadata.SubscriptionId
+    });
+
+    var contextValues = stream.ResponseStream.ToListAsync().GetAwaiter().GetResult();
+
+    return contextValues.Where(c => c.ResultCase == GrpcPipelinePartExecutionResult.ResultOneofCase.PipelinePartResult)
+      .SelectMany(c => c.PipelinePartResult.ContextValues)
+      .First(c => c.Value.ContextValueCase is GrpcContextValue.ContextValueOneofCase.NamesLog);
+  }
 
   private static IEventLog GenerateTestEventLog()
   {

From 9e45d760d6af9efec470c6bdb498d2a23069e280 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Tue, 5 May 2026 13:35:09 +0300
Subject: [PATCH 31/53] Bugfix

---
 Ficus/protos/backend_service.proto               |  3 +--
 Ficus/protos/kafka_service.proto                 |  2 +-
 .../Services/IPipelinePartsUpdatesRepository.cs  | 16 +++++++++++-----
 .../FicusDashboardBackend.csproj                 |  1 +
 .../ficus/grpc_pipelines/entry_points/util.py    |  2 +-
 .../src/grpc/events/grpc_events_handler.rs       |  5 +----
 .../src/grpc/kafka/grpc_kafka_service.rs         |  4 ++--
 .../src/grpc/kafka/kafka_service.rs              | 13 +++++++++----
 .../src/grpc/kafka/streaming/processors.rs       |  6 +++---
 .../src/grpc/kafka/streaming/t1/processors.rs    | 10 +++++++---
 .../kafka/streaming/t2/dfg_data_structures.rs    |  9 +++++----
 .../src/grpc/kafka/streaming/t2/processors.rs    |  4 ++--
 docker-compose.monitoring.yml                    |  1 +
 13 files changed, 45 insertions(+), 31 deletions(-)

diff --git a/Ficus/protos/backend_service.proto b/Ficus/protos/backend_service.proto
index 9d5d1b68f..7880a40e8 100644
--- a/Ficus/protos/backend_service.proto
+++ b/Ficus/protos/backend_service.proto
@@ -60,9 +60,8 @@ message GrpcPipelinePartLogMessage {
 
 message GrpcPipelinePartResult {
   repeated GrpcContextValueWithKeyName contextValues = 1;
-  GrpcGuid guid = 2;
+  GrpcGuid pipeline_part_id = 2;
   string pipeline_part_name = 3;
-  GrpcGuid pipeline_part_id = 4;
 }
 
 message GrpcPipelineFinalResult {
diff --git a/Ficus/protos/kafka_service.proto b/Ficus/protos/kafka_service.proto
index 0bf0943f5..ba76ce791 100644
--- a/Ficus/protos/kafka_service.proto
+++ b/Ficus/protos/kafka_service.proto
@@ -29,7 +29,7 @@ service GrpcKafkaService {
 message GrpcGetCurrentContextValuesRequest {
   GrpcGuid subscriptionId = 1;
   GrpcGuid pipelineId = 2;
-  string processName = 3;
+  string caseName = 3;
 }
 
 message GrpcExecutePipelineAndProduceKafkaRequest {
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/IPipelinePartsUpdatesRepository.cs b/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/IPipelinePartsUpdatesRepository.cs
index 873b7c2a7..2e1640652 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/IPipelinePartsUpdatesRepository.cs
+++ b/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/IPipelinePartsUpdatesRepository.cs
@@ -1,6 +1,7 @@
 using Ficus;
 using FicusDashboardBackend.Utils;
 using Google.Protobuf.WellKnownTypes;
+using Grpc.Net.Client;
 using GrpcModels;
 
 namespace FicusDashboardBackend.Features.PipelineUpdates.Services;
@@ -14,8 +15,8 @@ public interface IPipelinePartsUpdatesRepository
 }
 
 public class PipelinePartsUpdatesRepository(
-  ILogger<PipelinePartsUpdatesRepository> logger,
-  GrpcKafkaService.GrpcKafkaServiceClient kafkaClient
+  IConfiguration configuration,
+  ILogger<PipelinePartsUpdatesRepository> logger
 ) : IPipelinePartsUpdatesRepository
 {
   private class CaseData
@@ -62,7 +63,7 @@ public Task<GrpcSubscriptionAndPipelinesStateResponse> GetCurrentState()
       var response = new GrpcSubscriptionAndPipelinesStateResponse();
       foreach (var (caseKey, @case) in myCases)
       {
-        response.Cases.Add(new GrpcProcessCaseMetadataWithStamp()
+        response.Cases.Add(new GrpcProcessCaseMetadataWithStamp
         {
           Stamp = @case.Stamp,
           Metadata = new GrpcProcessCaseMetadata
@@ -105,10 +106,15 @@ public async Task<GrpcCaseContextValues> GetCaseContextValues(GrpcGetPipelineCas
       )
     );
 
-    var stream = kafkaClient.GetCurrentContextValues(new GrpcGetCurrentContextValuesRequest
+    const string KafkaServiceUrlKey = "KafkaServiceUrl";
+    var address = configuration[KafkaServiceUrlKey] ?? throw new KeyNotFoundException($"No {KafkaServiceUrlKey} provided");
+    var channel = GrpcChannel.ForAddress($"http://{address}");
+    var client = new GrpcKafkaService.GrpcKafkaServiceClient(channel);
+
+    var stream = client.GetCurrentContextValues(new GrpcGetCurrentContextValuesRequest
     {
       PipelineId = request.PipelineId,
-      ProcessName = request.ProcessName,
+      ProcessName = string.Join(";", request.CaseName.FullNameParts),
       SubscriptionId = request.SubscriptionId,
     });
 
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboardBackend/FicusDashboardBackend.csproj b/Ficus/src/front/FicusFrontend/FicusDashboardBackend/FicusDashboardBackend.csproj
index c45ce1760..f777e0ca1 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboardBackend/FicusDashboardBackend.csproj
+++ b/Ficus/src/front/FicusFrontend/FicusDashboardBackend/FicusDashboardBackend.csproj
@@ -10,6 +10,7 @@
   <ItemGroup>
     <PackageReference Include="Grpc.AspNetCore"/>
     <PackageReference Include="Grpc.AspNetCore.Web"/>
+    <PackageReference Include="Grpc.Net.Client"/>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Ficus/src/python/ficus/grpc_pipelines/entry_points/util.py b/Ficus/src/python/ficus/grpc_pipelines/entry_points/util.py
index cee2b4096..12519d577 100644
--- a/Ficus/src/python/ficus/grpc_pipelines/entry_points/util.py
+++ b/Ficus/src/python/ficus/grpc_pipelines/entry_points/util.py
@@ -43,7 +43,7 @@ def process_single_pipeline_output_stream(uuid_to_pipeline_with_callback, stream
       break
 
     if last_result.HasField('pipelinePartResult'):
-      issued_part_uuid = uuid.UUID(part_result.pipelinePartResult.guid.guid)
+      issued_part_uuid = uuid.UUID(part_result.pipelinePartResult.pipeline_part_id.guid)
       if issued_part_uuid in uuid_to_pipeline_with_callback:
         map = dict()
         for context_value_with_name in part_result.pipelinePartResult.contextValues:
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs b/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs
index d78e63379..f63296f15 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/events/grpc_events_handler.rs
@@ -59,13 +59,10 @@ impl GrpcPipelineEventsHandler {
   fn create_get_context_values_event(&self, event: &GetContextValuesEvent) -> GrpcPipelinePartExecutionResult {
     GrpcPipelinePartExecutionResult {
       result: Some(GrpcResult::PipelinePartResult(GrpcPipelinePartResult {
-        guid: Some(GrpcGuid {
-          guid: event.pipeline_part_id.to_string(),
-        }),
         context_values: create_grpc_context_values(&event.key_values),
         pipeline_part_name: event.pipeline_part_name.clone(),
         pipeline_part_id: Some(GrpcGuid {
-          guid: event.execution_id.to_string(),
+          guid: event.pipeline_part_id.to_string(),
         }),
       })),
     }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
index 6b34a7af5..2a59d0be2 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
@@ -88,14 +88,14 @@ impl GrpcKafkaService for GrpcKafkaServiceImpl {
   ) -> Result<Response<Self::ExecutePipelineAndProduceToKafkaStream>, Status> {
     let pipeline_id = request.get_ref().pipeline_id.as_ref().unwrap().to_uuid()?;
     let subscription_id = request.get_ref().subscription_id.as_ref().unwrap().to_uuid()?;
-    let process_name = request.get_ref().process_name.clone();
+    let case_name = request.get_ref().case_name.clone();
 
     let (sender, receiver) = mpsc::channel(4);
     let grpc_handler = Arc::new(GrpcPipelineEventsHandler::new(sender));
     let kafka_service = self.kafka_service.clone();
 
     tokio::task::spawn_blocking(move || {
-      match kafka_service.get_context_values(pipeline_id, subscription_id, &process_name, grpc_handler.clone()) {
+      match kafka_service.get_context_values(subscription_id, pipeline_id, &case_name, grpc_handler.clone()) {
         Ok(uuid) => {
           grpc_handler.handle(&PipelineEvent::FinalResult(PipelineFinalResult::Success(uuid)));
         }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
index 16468b6e9..a89aaf7ba 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
@@ -26,7 +26,7 @@ use crate::{
 use bxes_kafka::consumer::bxes_kafka_consumer::{BxesKafkaConsumer, BxesKafkaError, BxesKafkaTrace};
 use ficus::features::cases::CaseName;
 use ficus::pipelines::{context::LogMessageHandler, pipeline_parts::PipelineParts};
-use log::error;
+use log::{debug, error, warn};
 use rdkafka::{ClientConfig, error::KafkaError};
 use std::{
   collections::HashMap,
@@ -257,31 +257,36 @@ impl KafkaService {
     &self,
     sub_id: Uuid,
     pipeline_id: Uuid,
-    process_name: &str,
+    case_name: &str,
     handler: Arc<GrpcPipelineEventsHandler>,
   ) -> Result<Uuid, Status> {
     let map = self.subscriptions_to_execution_requests.lock().expect("Must acquire lock");
     let Some(kafka_subscription) = map.get(&sub_id).cloned() else {
+      warn!("Subscription {} not found. Map: {:?}", sub_id, map.keys());
       return Err(Status::not_found(format!("Failed to find subscription for id {sub_id}")));
     };
 
     drop(map);
 
     let Some(pipeline) = kafka_subscription.pipelines.get(&pipeline_id) else {
-      return Err(Status::not_found(format!("Failed to find pipeline for id {sub_id}")));
+      warn!("Pipeline {} not found", pipeline_id);
+      return Err(Status::not_found(format!("Failed to find pipeline for id {pipeline_id}")));
     };
 
     let handler = handler as Arc<dyn PipelineEventsHandler>;
     let execution_dto = PipelineExecutionDto::new(Arc::new(PipelineParts::new()), handler);
     let context = Self::create_pipeline_execution_context(&pipeline.request, &execution_dto);
+
     let result = context.execute_grpc_pipeline_and_fill_context_values(
       |context| {
-        pipeline.processor.fill_pipeline_context(context, process_name);
+        pipeline.processor.fill_pipeline_context(context, case_name);
         Ok(())
       },
       self.cv_service.clone(),
     );
 
+    debug!("Finished executing pipeline with result: {result:?}");
+
     result.map_err(|err| Status::internal(format!("Failed to execute pipeline, err: {}", err)))
   }
 }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs
index 9281eb175..223af2c01 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs
@@ -34,10 +34,10 @@ impl TracesProcessor {
     }
   }
 
-  pub fn fill_pipeline_context(&self, context: &mut PipelineContext, process_name: &str) {
+  pub fn fill_pipeline_context(&self, context: &mut PipelineContext, case_name: &str) {
     match self {
-      TracesProcessor::T1(processor) => processor.fill_pipeline_context(context, process_name),
-      TracesProcessor::T2(processor) => processor.fill_pipeline_context(context, process_name),
+      TracesProcessor::T1(processor) => processor.fill_pipeline_context(context, case_name),
+      TracesProcessor::T2(processor) => processor.fill_pipeline_context(context, case_name),
     }
   }
 }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
index 96e6cfad1..9bc6b2005 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
@@ -15,7 +15,7 @@ use ficus::{
   features::streaming::t1::filterers::T1LogFilterer,
   pipelines::context::{LogMessageHandler, PipelineContext},
 };
-use log::info;
+use log::{info, warn};
 use std::{
   cell::RefCell,
   collections::HashMap,
@@ -51,10 +51,14 @@ impl T1StreamingProcessor {
     }
   }
 
-  pub fn fill_pipeline_context(&self, context: &mut PipelineContext, process_name: &str) {
+  pub fn fill_pipeline_context(&self, context: &mut PipelineContext, case_name: &str) {
     let names_to_log = self.names_to_logs.lock().unwrap();
-    if let Some(log) = names_to_log.get(process_name).cloned() {
+
+    if let Some(log) = names_to_log.get(case_name).cloned() {
       context.put_concrete(EVENT_LOG_KEY.key(), log);
+      info!("Filled event log for case {case_name:?}");
+    } else {
+      warn!("Failed to find log for case {case_name:?}");
     }
   }
 }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
index 6961f5a57..92adf9ee4 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
@@ -12,7 +12,7 @@ use ficus::features::streaming::counters::sliding_window::SlidingWindow;
 use ficus::pipelines::context::PipelineContext;
 use ficus::pipelines::keys::context_keys::EVENT_LOG_INFO_KEY;
 use ficus::utils::user_data::user_data::UserData;
-use log::{debug, warn};
+use log::{debug, info, warn};
 use std::{cell::RefCell, collections::HashMap, hash::Hash, rc::Rc, time::Duration};
 use uuid::Uuid;
 
@@ -197,13 +197,14 @@ impl DfgDataStructures {
     self.base.invalidate();
   }
 
-  pub fn fill_pipeline_context(&self, context: &mut PipelineContext, process_name: &str) {
-    match self.base.to_event_log_info(process_name) {
+  pub fn fill_pipeline_context(&self, context: &mut PipelineContext, case_name: &str) {
+    match self.base.to_event_log_info(case_name) {
       None => {
-        warn!("Failed to create offline event log info")
+        warn!("Failed to create offline event log info for case {case_name}");
       }
       Some(log_info) => {
         context.put_concrete(EVENT_LOG_INFO_KEY.key(), log_info);
+        info!("Filled offline event log info for case {case_name}");
       }
     }
   }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/processors.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/processors.rs
index 020d7312a..e610a6981 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/processors.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/processors.rs
@@ -98,7 +98,7 @@ impl T2StreamingProcessor {
     }
   }
 
-  pub fn fill_pipeline_context(&self, context: &mut PipelineContext, process_name: &str) {
-    self.dfg_data_structure.lock().unwrap().fill_pipeline_context(context, process_name);
+  pub fn fill_pipeline_context(&self, context: &mut PipelineContext, case_name: &str) {
+    self.dfg_data_structure.lock().unwrap().fill_pipeline_context(context, case_name);
   }
 }
diff --git a/docker-compose.monitoring.yml b/docker-compose.monitoring.yml
index 3fc7e990e..544dbace2 100644
--- a/docker-compose.monitoring.yml
+++ b/docker-compose.monitoring.yml
@@ -96,6 +96,7 @@ services:
     environment:
       PipelinePartsUpdateKafkaSettings__BootstrapServers: kafka:29092
       PipelinePartsUpdateKafkaSettings__Topic: ficus-topic
+      KafkaServiceUrl: ficus-backend:8080
 
   balancer:
     depends_on:

From a08eb9cd22c5287d3ed444fdb6f75125934bcb90 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Tue, 5 May 2026 13:56:01 +0300
Subject: [PATCH 32/53] ProcessName -> CaseName

---
 .../PipelineUpdates/Services/IPipelinePartsUpdatesRepository.cs | 2 +-
 .../IntegrationTests/FicusKafkaIntegrationTests.cs              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/IPipelinePartsUpdatesRepository.cs b/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/IPipelinePartsUpdatesRepository.cs
index 2e1640652..ded4f7732 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/IPipelinePartsUpdatesRepository.cs
+++ b/Ficus/src/front/FicusFrontend/FicusDashboardBackend/Features/PipelineUpdates/Services/IPipelinePartsUpdatesRepository.cs
@@ -114,7 +114,7 @@ public async Task<GrpcCaseContextValues> GetCaseContextValues(GrpcGetPipelineCas
     var stream = client.GetCurrentContextValues(new GrpcGetCurrentContextValuesRequest
     {
       PipelineId = request.PipelineId,
-      ProcessName = string.Join(";", request.CaseName.FullNameParts),
+      CaseName = string.Join(";", request.CaseName.FullNameParts),
       SubscriptionId = request.SubscriptionId,
     });
 
diff --git a/Ficus/test/IntegrationTests/IntegrationTests/FicusKafkaIntegrationTests.cs b/Ficus/test/IntegrationTests/IntegrationTests/FicusKafkaIntegrationTests.cs
index 742f34008..3373f4eb5 100644
--- a/Ficus/test/IntegrationTests/IntegrationTests/FicusKafkaIntegrationTests.cs
+++ b/Ficus/test/IntegrationTests/IntegrationTests/FicusKafkaIntegrationTests.cs
@@ -77,7 +77,7 @@ private GrpcContextValueWithKeyName FindLastNamesLog(IReadOnlyList<GrpcKafkaUpda
     var stream = KafkaClient.GetCurrentContextValues(new GrpcGetCurrentContextValuesRequest
     {
       PipelineId = lastUpdate.ProcessCaseMetadata.PipelineId,
-      ProcessName = lastUpdate.ProcessCaseMetadata.ProcessName,
+      CaseName = string.Join(";", lastUpdate.ProcessCaseMetadata.CaseName.FullNameParts),
       SubscriptionId = lastUpdate.ProcessCaseMetadata.SubscriptionId
     });
 

From f351e100bada48a2f69cd7a4c1ae11da8fffa509 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Tue, 5 May 2026 15:24:13 +0300
Subject: [PATCH 33/53] Use auto-commit, don't poll

---
 .../PipelinePartsUpdatesConsumer.cs                |  4 ++--
 .../src/grpc/events/kafka_events_handler.rs        | 14 ++++----------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/Ficus/src/front/FicusFrontend/FicusKafkaIntegration/PipelinePartsUpdatesConsumer.cs b/Ficus/src/front/FicusFrontend/FicusKafkaIntegration/PipelinePartsUpdatesConsumer.cs
index 6342d5f86..0928fa2a2 100644
--- a/Ficus/src/front/FicusFrontend/FicusKafkaIntegration/PipelinePartsUpdatesConsumer.cs
+++ b/Ficus/src/front/FicusFrontend/FicusKafkaIntegration/PipelinePartsUpdatesConsumer.cs
@@ -36,8 +36,6 @@ public IEnumerable<GrpcKafkaUpdate> StartUpdatesConsuming(CancellationToken canc
         if (result.IsPartitionEOF) continue;
 
         yield return result.Message.Value;
-
-        consumer.Commit(result);
       }
     }
     finally
@@ -57,6 +55,8 @@ public static IConsumer<Guid, GrpcKafkaUpdate> CreateConsumerAndWaitUntilTopicEx
   {
     var config = new ConsumerConfig
     {
+      EnableAutoCommit = true,
+      AutoCommitIntervalMs = 200,
       BootstrapServers = settings.BootstrapServers,
       GroupId = consumerGroupId,
       EnablePartitionEof = true,
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/events/kafka_events_handler.rs b/Ficus/src/rust/ficus_backend/src/grpc/events/kafka_events_handler.rs
index b48a6dcc9..2f434e6bf 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/events/kafka_events_handler.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/events/kafka_events_handler.rs
@@ -1,19 +1,16 @@
 use super::events_handler::{PipelineEvent, PipelineEventsHandler, PipelineFinalResult};
 use crate::{
-  ficus_proto::{
-    GrpcCaseName, GrpcGuid, GrpcKafkaConnectionMetadata, GrpcKafkaUpdate, GrpcProcessCaseMetadata, GrpcStringKeyValue,
-  },
+  ficus_proto::{GrpcCaseName, GrpcGuid, GrpcKafkaConnectionMetadata, GrpcKafkaUpdate, GrpcProcessCaseMetadata, GrpcStringKeyValue},
   grpc::logs_handler::ConsoleLogMessageHandler,
 };
 use ficus::{features::cases::CaseName, pipelines::context::LogMessageHandler};
 use prost::Message;
 use rdkafka::{
+  ClientConfig,
   error::KafkaError,
   producer::{BaseProducer, BaseRecord},
-  util::Timeout,
-  ClientConfig,
 };
-use std::{rc::Rc, time::Duration};
+use std::rc::Rc;
 use uuid::Uuid;
 
 pub struct PipelineEventsProducer {
@@ -45,10 +42,7 @@ impl PipelineEventsProducer {
       .payload(&encoded_message);
 
     let result = match self.producer.send(record) {
-      Ok(_) => {
-        self.producer.poll(Timeout::After(Duration::from_millis(50)));
-        Ok(())
-      }
+      Ok(_) => Ok(()),
       Err(err) => Err(err.0),
     };
 

From fa9cf4dfdb8c0488a26090b1b0a09e7d45ae3ba2 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Tue, 5 May 2026 17:06:21 +0300
Subject: [PATCH 34/53] Add kafka dashboard

---
 docker-compose.monitoring.yml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/docker-compose.monitoring.yml b/docker-compose.monitoring.yml
index 544dbace2..53e1d0c97 100644
--- a/docker-compose.monitoring.yml
+++ b/docker-compose.monitoring.yml
@@ -60,6 +60,20 @@ services:
       sleep infinity
       "
 
+  kafka-ui:
+    image: provectuslabs/kafka-ui:latest
+    ports:
+      - "9000:8080"
+    environment:
+      KAFKA_CLUSTERS_0_NAME: local
+      KAFKA_CLUSTERS_0_BOOTSTRAPSERVERS: kafka:29092
+      KAFKA_CLUSTERS_0_READONLY: "false"
+      AUTH_TYPE: "LOGIN_FORM"
+      SPRING_SECURITY_USER_NAME: admin
+      SPRING_SECURITY_USER_PASSWORD: pass
+    depends_on:
+      - kafka
+
   ficus-backend:
     depends_on:
       - kafka
@@ -116,4 +130,4 @@ services:
       context: .
       dockerfile: ./Ficus/docker/run/Run.FicusDashboard.Dockerfile
     ports:
-      - "8080:8080"
\ No newline at end of file
+      - "8080:8080"

From 1bb6834618607e788c745baaac2cef6191a419c4 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneq@yandex.ru>
Date: Tue, 5 May 2026 18:13:32 +0300
Subject: [PATCH 35/53] Regenerate models

---
 .../Npm/src/protos/backend_service.ts         |   2 -
 .../Npm/src/protos/context_values_service.ts  |   2 +
 .../src/protos/ficus/GrpcBackendService.ts    |  26 --
 .../protos/ficus/GrpcContextValuesService.ts  |  26 ++
 .../ficus/GrpcGetAllContextValuesResult.ts    |   2 +-
 .../ficus/GrpcGetContextValueRequest.ts       |   2 +-
 .../GrpcGetCurrentContextValuesRequest.ts     |  15 +
 .../protos/ficus/GrpcKafkaContextValues.ts    |  11 +
 .../Npm/src/protos/ficus/GrpcKafkaService.ts  |   9 +
 .../Npm/src/protos/ficus/GrpcKafkaUpdate.ts   |   6 -
 .../protos/ficus/GrpcPipelinePartResult.ts    |   6 +-
 .../Npm/src/protos/front_contract.ts          |   1 +
 .../Npm/src/protos/kafka_service.ts           |   3 +-
 Ficus/src/go/grpcmodels/backend_service.pb.go | 260 ++++-------
 .../go/grpcmodels/backend_service_grpc.pb.go  |  76 ---
 .../grpcmodels/context_values_service.pb.go   | 153 ++++++-
 .../context_values_service_grpc.pb.go         |  82 +++-
 Ficus/src/go/grpcmodels/front_contract.pb.go  | 290 ++++++------
 Ficus/src/go/grpcmodels/kafka_service.pb.go   | 432 ++++++++++--------
 .../go/grpcmodels/kafka_service_grpc.pb.go    |  45 +-
 .../models/backend_service_pb2.py             |  42 +-
 .../models/backend_service_pb2.pyi            |  24 +-
 .../models/backend_service_pb2_grpc.py        | 132 ------
 .../models/context_values_service_pb2.py      |  14 +-
 .../models/context_values_service_pb2.pyi     |  14 +
 .../models/context_values_service_pb2_grpc.py | 132 ++++++
 .../models/front_contract_pb2.py              |  38 +-
 .../models/front_contract_pb2.pyi             |  32 +-
 .../models/kafka_service_pb2.py               | 118 ++---
 .../models/kafka_service_pb2.pyi              |  10 +
 .../models/kafka_service_pb2_grpc.py          |  66 +++
 31 files changed, 1170 insertions(+), 901 deletions(-)
 create mode 100644 Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcGetCurrentContextValuesRequest.ts
 create mode 100644 Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcKafkaContextValues.ts

diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/backend_service.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/backend_service.ts
index 0fe6250e0..314731b4c 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/backend_service.ts
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/backend_service.ts
@@ -49,8 +49,6 @@ export interface ProtoGrpcType {
     GrpcFrequenciesAnnotation: MessageTypeDefinition
     GrpcGeneralHistogramData: MessageTypeDefinition
     GrpcGenericEnhancementBase: MessageTypeDefinition
-    GrpcGetAllContextValuesResult: MessageTypeDefinition
-    GrpcGetContextValueRequest: MessageTypeDefinition
     GrpcGraph: MessageTypeDefinition
     GrpcGraphEdge: MessageTypeDefinition
     GrpcGraphEdgeAdditionalData: MessageTypeDefinition
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/context_values_service.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/context_values_service.ts
index 4a4e99887..421a5e979 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/context_values_service.ts
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/context_values_service.ts
@@ -48,6 +48,8 @@ export interface ProtoGrpcType {
     GrpcFrequenciesAnnotation: MessageTypeDefinition
     GrpcGeneralHistogramData: MessageTypeDefinition
     GrpcGenericEnhancementBase: MessageTypeDefinition
+    GrpcGetAllContextValuesResult: MessageTypeDefinition
+    GrpcGetContextValueRequest: MessageTypeDefinition
     GrpcGraph: MessageTypeDefinition
     GrpcGraphEdge: MessageTypeDefinition
     GrpcGraphEdgeAdditionalData: MessageTypeDefinition
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcBackendService.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcBackendService.ts
index 3bdf76a79..a2da18968 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcBackendService.ts
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcBackendService.ts
@@ -4,8 +4,6 @@ import type * as grpc from '@grpc/grpc-js'
 import type { MethodDefinition } from '@grpc/proto-loader'
 import type { Empty_DONTUSE as _google_protobuf_Empty_DONTUSE, Empty as _google_protobuf_Empty } from '../google/protobuf/Empty';
 import type { GrpcFicusBackendInfo_DONTUSE as _ficus_GrpcFicusBackendInfo_DONTUSE, GrpcFicusBackendInfo as _ficus_GrpcFicusBackendInfo } from '../ficus/GrpcFicusBackendInfo';
-import type { GrpcGetAllContextValuesResult_DONTUSE as _ficus_GrpcGetAllContextValuesResult_DONTUSE, GrpcGetAllContextValuesResult as _ficus_GrpcGetAllContextValuesResult } from '../ficus/GrpcGetAllContextValuesResult';
-import type { GrpcGetContextValueRequest_DONTUSE as _ficus_GrpcGetContextValueRequest_DONTUSE, GrpcGetContextValueRequest as _ficus_GrpcGetContextValueRequest } from '../ficus/GrpcGetContextValueRequest';
 import type { GrpcGuid_DONTUSE as _ficus_GrpcGuid_DONTUSE, GrpcGuid as _ficus_GrpcGuid } from '../ficus/GrpcGuid';
 import type { GrpcPipelinePartExecutionResult_DONTUSE as _ficus_GrpcPipelinePartExecutionResult_DONTUSE, GrpcPipelinePartExecutionResult as _ficus_GrpcPipelinePartExecutionResult } from '../ficus/GrpcPipelinePartExecutionResult';
 import type { GrpcProxyPipelineExecutionRequest_DONTUSE as _ficus_GrpcProxyPipelineExecutionRequest_DONTUSE, GrpcProxyPipelineExecutionRequest as _ficus_GrpcProxyPipelineExecutionRequest } from '../ficus/GrpcProxyPipelineExecutionRequest';
@@ -25,15 +23,6 @@ export interface GrpcBackendServiceClient extends grpc.Client {
   executePipeline(argument: _ficus_GrpcProxyPipelineExecutionRequest_DONTUSE, metadata: grpc.Metadata, options?: grpc.CallOptions): grpc.ClientReadableStream<_ficus_GrpcPipelinePartExecutionResult>;
   executePipeline(argument: _ficus_GrpcProxyPipelineExecutionRequest_DONTUSE, options?: grpc.CallOptions): grpc.ClientReadableStream<_ficus_GrpcPipelinePartExecutionResult>;
   
-  GetAllContextValues(argument: _ficus_GrpcGuid_DONTUSE, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
-  GetAllContextValues(argument: _ficus_GrpcGuid_DONTUSE, metadata: grpc.Metadata, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
-  GetAllContextValues(argument: _ficus_GrpcGuid_DONTUSE, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
-  GetAllContextValues(argument: _ficus_GrpcGuid_DONTUSE, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
-  getAllContextValues(argument: _ficus_GrpcGuid_DONTUSE, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
-  getAllContextValues(argument: _ficus_GrpcGuid_DONTUSE, metadata: grpc.Metadata, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
-  getAllContextValues(argument: _ficus_GrpcGuid_DONTUSE, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
-  getAllContextValues(argument: _ficus_GrpcGuid_DONTUSE, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
-  
   GetBackendInfo(argument: _google_protobuf_Empty_DONTUSE, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcFicusBackendInfo>): grpc.ClientUnaryCall;
   GetBackendInfo(argument: _google_protobuf_Empty_DONTUSE, metadata: grpc.Metadata, callback: grpc.requestCallback<_ficus_GrpcFicusBackendInfo>): grpc.ClientUnaryCall;
   GetBackendInfo(argument: _google_protobuf_Empty_DONTUSE, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcFicusBackendInfo>): grpc.ClientUnaryCall;
@@ -43,15 +32,6 @@ export interface GrpcBackendServiceClient extends grpc.Client {
   getBackendInfo(argument: _google_protobuf_Empty_DONTUSE, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcFicusBackendInfo>): grpc.ClientUnaryCall;
   getBackendInfo(argument: _google_protobuf_Empty_DONTUSE, callback: grpc.requestCallback<_ficus_GrpcFicusBackendInfo>): grpc.ClientUnaryCall;
   
-  GetContextValue(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
-  GetContextValue(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, metadata: grpc.Metadata, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
-  GetContextValue(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
-  GetContextValue(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
-  getContextValue(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
-  getContextValue(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, metadata: grpc.Metadata, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
-  getContextValue(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
-  getContextValue(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
-  
 }
 
 export interface GrpcBackendServiceHandlers extends grpc.UntypedServiceImplementation {
@@ -59,18 +39,12 @@ export interface GrpcBackendServiceHandlers extends grpc.UntypedServiceImplement
   
   ExecutePipeline: grpc.handleServerStreamingCall<_ficus_GrpcProxyPipelineExecutionRequest, _ficus_GrpcPipelinePartExecutionResult_DONTUSE>;
   
-  GetAllContextValues: grpc.handleUnaryCall<_ficus_GrpcGuid, _ficus_GrpcGetAllContextValuesResult_DONTUSE>;
-  
   GetBackendInfo: grpc.handleUnaryCall<_google_protobuf_Empty, _ficus_GrpcFicusBackendInfo_DONTUSE>;
   
-  GetContextValue: grpc.handleUnaryCall<_ficus_GrpcGetContextValueRequest, _ficus_GrpcGuid_DONTUSE>;
-  
 }
 
 export interface GrpcBackendServiceDefinition extends grpc.ServiceDefinition {
   DropExecutionResult: MethodDefinition<_ficus_GrpcGuid_DONTUSE, _google_protobuf_Empty_DONTUSE, _ficus_GrpcGuid, _google_protobuf_Empty>
   ExecutePipeline: MethodDefinition<_ficus_GrpcProxyPipelineExecutionRequest_DONTUSE, _ficus_GrpcPipelinePartExecutionResult_DONTUSE, _ficus_GrpcProxyPipelineExecutionRequest, _ficus_GrpcPipelinePartExecutionResult>
-  GetAllContextValues: MethodDefinition<_ficus_GrpcGuid_DONTUSE, _ficus_GrpcGetAllContextValuesResult_DONTUSE, _ficus_GrpcGuid, _ficus_GrpcGetAllContextValuesResult>
   GetBackendInfo: MethodDefinition<_google_protobuf_Empty_DONTUSE, _ficus_GrpcFicusBackendInfo_DONTUSE, _google_protobuf_Empty, _ficus_GrpcFicusBackendInfo>
-  GetContextValue: MethodDefinition<_ficus_GrpcGetContextValueRequest_DONTUSE, _ficus_GrpcGuid_DONTUSE, _ficus_GrpcGetContextValueRequest, _ficus_GrpcGuid>
 }
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcContextValuesService.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcContextValuesService.ts
index 420d752c1..e10237cda 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcContextValuesService.ts
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcContextValuesService.ts
@@ -5,6 +5,8 @@ import type { MethodDefinition } from '@grpc/proto-loader'
 import type { Empty_DONTUSE as _google_protobuf_Empty_DONTUSE, Empty as _google_protobuf_Empty } from '../google/protobuf/Empty';
 import type { GrpcContextValuePart_DONTUSE as _ficus_GrpcContextValuePart_DONTUSE, GrpcContextValuePart as _ficus_GrpcContextValuePart } from '../ficus/GrpcContextValuePart';
 import type { GrpcDropContextValuesRequest_DONTUSE as _ficus_GrpcDropContextValuesRequest_DONTUSE, GrpcDropContextValuesRequest as _ficus_GrpcDropContextValuesRequest } from '../ficus/GrpcDropContextValuesRequest';
+import type { GrpcGetAllContextValuesResult_DONTUSE as _ficus_GrpcGetAllContextValuesResult_DONTUSE, GrpcGetAllContextValuesResult as _ficus_GrpcGetAllContextValuesResult } from '../ficus/GrpcGetAllContextValuesResult';
+import type { GrpcGetContextValueRequest_DONTUSE as _ficus_GrpcGetContextValueRequest_DONTUSE, GrpcGetContextValueRequest as _ficus_GrpcGetContextValueRequest } from '../ficus/GrpcGetContextValueRequest';
 import type { GrpcGuid_DONTUSE as _ficus_GrpcGuid_DONTUSE, GrpcGuid as _ficus_GrpcGuid } from '../ficus/GrpcGuid';
 
 export interface GrpcContextValuesServiceClient extends grpc.Client {
@@ -17,11 +19,29 @@ export interface GrpcContextValuesServiceClient extends grpc.Client {
   dropContextValues(argument: _ficus_GrpcDropContextValuesRequest_DONTUSE, options: grpc.CallOptions, callback: grpc.requestCallback<_google_protobuf_Empty>): grpc.ClientUnaryCall;
   dropContextValues(argument: _ficus_GrpcDropContextValuesRequest_DONTUSE, callback: grpc.requestCallback<_google_protobuf_Empty>): grpc.ClientUnaryCall;
   
+  GetAllContextValuesIds(argument: _ficus_GrpcGuid_DONTUSE, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
+  GetAllContextValuesIds(argument: _ficus_GrpcGuid_DONTUSE, metadata: grpc.Metadata, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
+  GetAllContextValuesIds(argument: _ficus_GrpcGuid_DONTUSE, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
+  GetAllContextValuesIds(argument: _ficus_GrpcGuid_DONTUSE, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
+  getAllContextValuesIds(argument: _ficus_GrpcGuid_DONTUSE, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
+  getAllContextValuesIds(argument: _ficus_GrpcGuid_DONTUSE, metadata: grpc.Metadata, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
+  getAllContextValuesIds(argument: _ficus_GrpcGuid_DONTUSE, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
+  getAllContextValuesIds(argument: _ficus_GrpcGuid_DONTUSE, callback: grpc.requestCallback<_ficus_GrpcGetAllContextValuesResult>): grpc.ClientUnaryCall;
+  
   GetContextValue(argument: _ficus_GrpcGuid_DONTUSE, metadata: grpc.Metadata, options?: grpc.CallOptions): grpc.ClientReadableStream<_ficus_GrpcContextValuePart>;
   GetContextValue(argument: _ficus_GrpcGuid_DONTUSE, options?: grpc.CallOptions): grpc.ClientReadableStream<_ficus_GrpcContextValuePart>;
   getContextValue(argument: _ficus_GrpcGuid_DONTUSE, metadata: grpc.Metadata, options?: grpc.CallOptions): grpc.ClientReadableStream<_ficus_GrpcContextValuePart>;
   getContextValue(argument: _ficus_GrpcGuid_DONTUSE, options?: grpc.CallOptions): grpc.ClientReadableStream<_ficus_GrpcContextValuePart>;
   
+  GetContextValueId(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
+  GetContextValueId(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, metadata: grpc.Metadata, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
+  GetContextValueId(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
+  GetContextValueId(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
+  getContextValueId(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
+  getContextValueId(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, metadata: grpc.Metadata, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
+  getContextValueId(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
+  getContextValueId(argument: _ficus_GrpcGetContextValueRequest_DONTUSE, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientUnaryCall;
+  
   SetContextValue(metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientWritableStream<_ficus_GrpcContextValuePart_DONTUSE>;
   SetContextValue(metadata: grpc.Metadata, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientWritableStream<_ficus_GrpcContextValuePart_DONTUSE>;
   SetContextValue(options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGuid>): grpc.ClientWritableStream<_ficus_GrpcContextValuePart_DONTUSE>;
@@ -36,14 +56,20 @@ export interface GrpcContextValuesServiceClient extends grpc.Client {
 export interface GrpcContextValuesServiceHandlers extends grpc.UntypedServiceImplementation {
   DropContextValues: grpc.handleUnaryCall<_ficus_GrpcDropContextValuesRequest, _google_protobuf_Empty_DONTUSE>;
   
+  GetAllContextValuesIds: grpc.handleUnaryCall<_ficus_GrpcGuid, _ficus_GrpcGetAllContextValuesResult_DONTUSE>;
+  
   GetContextValue: grpc.handleServerStreamingCall<_ficus_GrpcGuid, _ficus_GrpcContextValuePart_DONTUSE>;
   
+  GetContextValueId: grpc.handleUnaryCall<_ficus_GrpcGetContextValueRequest, _ficus_GrpcGuid_DONTUSE>;
+  
   SetContextValue: grpc.handleClientStreamingCall<_ficus_GrpcContextValuePart, _ficus_GrpcGuid_DONTUSE>;
   
 }
 
 export interface GrpcContextValuesServiceDefinition extends grpc.ServiceDefinition {
   DropContextValues: MethodDefinition<_ficus_GrpcDropContextValuesRequest_DONTUSE, _google_protobuf_Empty_DONTUSE, _ficus_GrpcDropContextValuesRequest, _google_protobuf_Empty>
+  GetAllContextValuesIds: MethodDefinition<_ficus_GrpcGuid_DONTUSE, _ficus_GrpcGetAllContextValuesResult_DONTUSE, _ficus_GrpcGuid, _ficus_GrpcGetAllContextValuesResult>
   GetContextValue: MethodDefinition<_ficus_GrpcGuid_DONTUSE, _ficus_GrpcContextValuePart_DONTUSE, _ficus_GrpcGuid, _ficus_GrpcContextValuePart>
+  GetContextValueId: MethodDefinition<_ficus_GrpcGetContextValueRequest_DONTUSE, _ficus_GrpcGuid_DONTUSE, _ficus_GrpcGetContextValueRequest, _ficus_GrpcGuid>
   SetContextValue: MethodDefinition<_ficus_GrpcContextValuePart_DONTUSE, _ficus_GrpcGuid_DONTUSE, _ficus_GrpcContextValuePart, _ficus_GrpcGuid>
 }
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcGetAllContextValuesResult.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcGetAllContextValuesResult.ts
index 0e2903f66..104532514 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcGetAllContextValuesResult.ts
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcGetAllContextValuesResult.ts
@@ -1,4 +1,4 @@
-// Original file: ../../../../../protos/backend_service.proto
+// Original file: ../../../../../protos/context_values_service.proto
 
 import type { GrpcGuid_DONTUSE as _ficus_GrpcGuid_DONTUSE, GrpcGuid as _ficus_GrpcGuid } from '../ficus/GrpcGuid';
 
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcGetContextValueRequest.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcGetContextValueRequest.ts
index 685c97066..c5f46fd28 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcGetContextValueRequest.ts
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcGetContextValueRequest.ts
@@ -1,4 +1,4 @@
-// Original file: ../../../../../protos/backend_service.proto
+// Original file: ../../../../../protos/context_values_service.proto
 
 import type { GrpcContextKey_DONTUSE as _ficus_GrpcContextKey_DONTUSE, GrpcContextKey as _ficus_GrpcContextKey } from '../ficus/GrpcContextKey';
 import type { GrpcGuid_DONTUSE as _ficus_GrpcGuid_DONTUSE, GrpcGuid as _ficus_GrpcGuid } from '../ficus/GrpcGuid';
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcGetCurrentContextValuesRequest.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcGetCurrentContextValuesRequest.ts
new file mode 100644
index 000000000..5af85db1e
--- /dev/null
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcGetCurrentContextValuesRequest.ts
@@ -0,0 +1,15 @@
+// Original file: ../../../../../protos/kafka_service.proto
+
+import type { GrpcGuid_DONTUSE as _ficus_GrpcGuid_DONTUSE, GrpcGuid as _ficus_GrpcGuid } from '../ficus/GrpcGuid';
+
+export interface GrpcGetCurrentContextValuesRequest_DONTUSE {
+  'subscriptionId'?: (_ficus_GrpcGuid_DONTUSE | null);
+  'pipelineId'?: (_ficus_GrpcGuid_DONTUSE | null);
+  'caseName'?: (string);
+}
+
+export interface GrpcGetCurrentContextValuesRequest {
+  'subscriptionId': (_ficus_GrpcGuid | null);
+  'pipelineId': (_ficus_GrpcGuid | null);
+  'caseName': (string);
+}
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcKafkaContextValues.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcKafkaContextValues.ts
new file mode 100644
index 000000000..8a194c055
--- /dev/null
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcKafkaContextValues.ts
@@ -0,0 +1,11 @@
+// Original file: ../../../../../protos/front_contract.proto
+
+import type { GrpcContextValueWithKeyName_DONTUSE as _ficus_GrpcContextValueWithKeyName_DONTUSE, GrpcContextValueWithKeyName as _ficus_GrpcContextValueWithKeyName } from '../ficus/GrpcContextValueWithKeyName';
+
+export interface GrpcKafkaContextValues_DONTUSE {
+  'contextValues'?: (_ficus_GrpcContextValueWithKeyName_DONTUSE)[];
+}
+
+export interface GrpcKafkaContextValues {
+  'contextValues': (_ficus_GrpcContextValueWithKeyName)[];
+}
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcKafkaService.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcKafkaService.ts
index da6a631ca..9b62d5c06 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcKafkaService.ts
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcKafkaService.ts
@@ -7,6 +7,7 @@ import type { GrpcAddPipelineRequest_DONTUSE as _ficus_GrpcAddPipelineRequest_DO
 import type { GrpcAddPipelineStreamRequest_DONTUSE as _ficus_GrpcAddPipelineStreamRequest_DONTUSE, GrpcAddPipelineStreamRequest as _ficus_GrpcAddPipelineStreamRequest } from '../ficus/GrpcAddPipelineStreamRequest';
 import type { GrpcExecutePipelineAndProduceKafkaRequest_DONTUSE as _ficus_GrpcExecutePipelineAndProduceKafkaRequest_DONTUSE, GrpcExecutePipelineAndProduceKafkaRequest as _ficus_GrpcExecutePipelineAndProduceKafkaRequest } from '../ficus/GrpcExecutePipelineAndProduceKafkaRequest';
 import type { GrpcGetAllSubscriptionsAndPipelinesResponse_DONTUSE as _ficus_GrpcGetAllSubscriptionsAndPipelinesResponse_DONTUSE, GrpcGetAllSubscriptionsAndPipelinesResponse as _ficus_GrpcGetAllSubscriptionsAndPipelinesResponse } from '../ficus/GrpcGetAllSubscriptionsAndPipelinesResponse';
+import type { GrpcGetCurrentContextValuesRequest_DONTUSE as _ficus_GrpcGetCurrentContextValuesRequest_DONTUSE, GrpcGetCurrentContextValuesRequest as _ficus_GrpcGetCurrentContextValuesRequest } from '../ficus/GrpcGetCurrentContextValuesRequest';
 import type { GrpcKafkaResult_DONTUSE as _ficus_GrpcKafkaResult_DONTUSE, GrpcKafkaResult as _ficus_GrpcKafkaResult } from '../ficus/GrpcKafkaResult';
 import type { GrpcPipelinePartExecutionResult_DONTUSE as _ficus_GrpcPipelinePartExecutionResult_DONTUSE, GrpcPipelinePartExecutionResult as _ficus_GrpcPipelinePartExecutionResult } from '../ficus/GrpcPipelinePartExecutionResult';
 import type { GrpcRemoveAllPipelinesRequest_DONTUSE as _ficus_GrpcRemoveAllPipelinesRequest_DONTUSE, GrpcRemoveAllPipelinesRequest as _ficus_GrpcRemoveAllPipelinesRequest } from '../ficus/GrpcRemoveAllPipelinesRequest';
@@ -43,6 +44,11 @@ export interface GrpcKafkaServiceClient extends grpc.Client {
   getAllSubscriptionsAndPipelines(argument: _google_protobuf_Empty_DONTUSE, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcGetAllSubscriptionsAndPipelinesResponse>): grpc.ClientUnaryCall;
   getAllSubscriptionsAndPipelines(argument: _google_protobuf_Empty_DONTUSE, callback: grpc.requestCallback<_ficus_GrpcGetAllSubscriptionsAndPipelinesResponse>): grpc.ClientUnaryCall;
   
+  GetCurrentContextValues(argument: _ficus_GrpcGetCurrentContextValuesRequest_DONTUSE, metadata: grpc.Metadata, options?: grpc.CallOptions): grpc.ClientReadableStream<_ficus_GrpcPipelinePartExecutionResult>;
+  GetCurrentContextValues(argument: _ficus_GrpcGetCurrentContextValuesRequest_DONTUSE, options?: grpc.CallOptions): grpc.ClientReadableStream<_ficus_GrpcPipelinePartExecutionResult>;
+  getCurrentContextValues(argument: _ficus_GrpcGetCurrentContextValuesRequest_DONTUSE, metadata: grpc.Metadata, options?: grpc.CallOptions): grpc.ClientReadableStream<_ficus_GrpcPipelinePartExecutionResult>;
+  getCurrentContextValues(argument: _ficus_GrpcGetCurrentContextValuesRequest_DONTUSE, options?: grpc.CallOptions): grpc.ClientReadableStream<_ficus_GrpcPipelinePartExecutionResult>;
+  
   RemoveAllPipelineSubscriptions(argument: _ficus_GrpcRemoveAllPipelinesRequest_DONTUSE, metadata: grpc.Metadata, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcKafkaResult>): grpc.ClientUnaryCall;
   RemoveAllPipelineSubscriptions(argument: _ficus_GrpcRemoveAllPipelinesRequest_DONTUSE, metadata: grpc.Metadata, callback: grpc.requestCallback<_ficus_GrpcKafkaResult>): grpc.ClientUnaryCall;
   RemoveAllPipelineSubscriptions(argument: _ficus_GrpcRemoveAllPipelinesRequest_DONTUSE, options: grpc.CallOptions, callback: grpc.requestCallback<_ficus_GrpcKafkaResult>): grpc.ClientUnaryCall;
@@ -90,6 +96,8 @@ export interface GrpcKafkaServiceHandlers extends grpc.UntypedServiceImplementat
   
   GetAllSubscriptionsAndPipelines: grpc.handleUnaryCall<_google_protobuf_Empty, _ficus_GrpcGetAllSubscriptionsAndPipelinesResponse_DONTUSE>;
   
+  GetCurrentContextValues: grpc.handleServerStreamingCall<_ficus_GrpcGetCurrentContextValuesRequest, _ficus_GrpcPipelinePartExecutionResult_DONTUSE>;
+  
   RemoveAllPipelineSubscriptions: grpc.handleUnaryCall<_ficus_GrpcRemoveAllPipelinesRequest, _ficus_GrpcKafkaResult_DONTUSE>;
   
   RemovePipelineSubscription: grpc.handleUnaryCall<_ficus_GrpcRemovePipelineRequest, _ficus_GrpcKafkaResult_DONTUSE>;
@@ -105,6 +113,7 @@ export interface GrpcKafkaServiceDefinition extends grpc.ServiceDefinition {
   AddPipelineToSubscriptionStream: MethodDefinition<_ficus_GrpcAddPipelineStreamRequest_DONTUSE, _ficus_GrpcPipelinePartExecutionResult_DONTUSE, _ficus_GrpcAddPipelineStreamRequest, _ficus_GrpcPipelinePartExecutionResult>
   ExecutePipelineAndProduceToKafka: MethodDefinition<_ficus_GrpcExecutePipelineAndProduceKafkaRequest_DONTUSE, _ficus_GrpcPipelinePartExecutionResult_DONTUSE, _ficus_GrpcExecutePipelineAndProduceKafkaRequest, _ficus_GrpcPipelinePartExecutionResult>
   GetAllSubscriptionsAndPipelines: MethodDefinition<_google_protobuf_Empty_DONTUSE, _ficus_GrpcGetAllSubscriptionsAndPipelinesResponse_DONTUSE, _google_protobuf_Empty, _ficus_GrpcGetAllSubscriptionsAndPipelinesResponse>
+  GetCurrentContextValues: MethodDefinition<_ficus_GrpcGetCurrentContextValuesRequest_DONTUSE, _ficus_GrpcPipelinePartExecutionResult_DONTUSE, _ficus_GrpcGetCurrentContextValuesRequest, _ficus_GrpcPipelinePartExecutionResult>
   RemoveAllPipelineSubscriptions: MethodDefinition<_ficus_GrpcRemoveAllPipelinesRequest_DONTUSE, _ficus_GrpcKafkaResult_DONTUSE, _ficus_GrpcRemoveAllPipelinesRequest, _ficus_GrpcKafkaResult>
   RemovePipelineSubscription: MethodDefinition<_ficus_GrpcRemovePipelineRequest_DONTUSE, _ficus_GrpcKafkaResult_DONTUSE, _ficus_GrpcRemovePipelineRequest, _ficus_GrpcKafkaResult>
   SubscribeForKafkaTopic: MethodDefinition<_ficus_GrpcSubscribeToKafkaRequest_DONTUSE, _ficus_GrpcKafkaResult_DONTUSE, _ficus_GrpcSubscribeToKafkaRequest, _ficus_GrpcKafkaResult>
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcKafkaUpdate.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcKafkaUpdate.ts
index 03b7a3667..aa6ec4f2e 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcKafkaUpdate.ts
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcKafkaUpdate.ts
@@ -1,17 +1,11 @@
 // Original file: ../../../../../protos/front_contract.proto
 
 import type { GrpcProcessCaseMetadata_DONTUSE as _ficus_GrpcProcessCaseMetadata_DONTUSE, GrpcProcessCaseMetadata as _ficus_GrpcProcessCaseMetadata } from '../ficus/GrpcProcessCaseMetadata';
-import type { GrpcPipelinePartInfo_DONTUSE as _ficus_GrpcPipelinePartInfo_DONTUSE, GrpcPipelinePartInfo as _ficus_GrpcPipelinePartInfo } from '../ficus/GrpcPipelinePartInfo';
-import type { GrpcContextValueWithKeyName_DONTUSE as _ficus_GrpcContextValueWithKeyName_DONTUSE, GrpcContextValueWithKeyName as _ficus_GrpcContextValueWithKeyName } from '../ficus/GrpcContextValueWithKeyName';
 
 export interface GrpcKafkaUpdate_DONTUSE {
   'processCaseMetadata'?: (_ficus_GrpcProcessCaseMetadata_DONTUSE | null);
-  'pipelinePartInfo'?: (_ficus_GrpcPipelinePartInfo_DONTUSE | null);
-  'contextValues'?: (_ficus_GrpcContextValueWithKeyName_DONTUSE)[];
 }
 
 export interface GrpcKafkaUpdate {
   'processCaseMetadata': (_ficus_GrpcProcessCaseMetadata | null);
-  'pipelinePartInfo': (_ficus_GrpcPipelinePartInfo | null);
-  'contextValues': (_ficus_GrpcContextValueWithKeyName)[];
 }
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcPipelinePartResult.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcPipelinePartResult.ts
index c4315a624..3c42d21d3 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcPipelinePartResult.ts
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/ficus/GrpcPipelinePartResult.ts
@@ -5,10 +5,12 @@ import type { GrpcGuid_DONTUSE as _ficus_GrpcGuid_DONTUSE, GrpcGuid as _ficus_Gr
 
 export interface GrpcPipelinePartResult_DONTUSE {
   'contextValues'?: (_ficus_GrpcContextValueWithKeyName_DONTUSE)[];
-  'guid'?: (_ficus_GrpcGuid_DONTUSE | null);
+  'pipelinePartId'?: (_ficus_GrpcGuid_DONTUSE | null);
+  'pipelinePartName'?: (string);
 }
 
 export interface GrpcPipelinePartResult {
   'contextValues': (_ficus_GrpcContextValueWithKeyName)[];
-  'guid': (_ficus_GrpcGuid | null);
+  'pipelinePartId': (_ficus_GrpcGuid | null);
+  'pipelinePartName': (string);
 }
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/front_contract.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/front_contract.ts
index 095dad5cb..7072588f3 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/front_contract.ts
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/front_contract.ts
@@ -60,6 +60,7 @@ export interface ProtoGrpcType {
     GrpcHashesLogTrace: MessageTypeDefinition
     GrpcHistogramEntry: MessageTypeDefinition
     GrpcIntArray: MessageTypeDefinition
+    GrpcKafkaContextValues: MessageTypeDefinition
     GrpcKafkaUpdate: MessageTypeDefinition
     GrpcLabeledDataset: MessageTypeDefinition
     GrpcLogPoint: MessageTypeDefinition
diff --git a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/kafka_service.ts b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/kafka_service.ts
index 96c3cba07..f150d745e 100644
--- a/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/kafka_service.ts
+++ b/Ficus/src/front/FicusFrontend/FicusDashboard/Npm/src/protos/kafka_service.ts
@@ -53,9 +53,8 @@ export interface ProtoGrpcType {
     GrpcFrequenciesAnnotation: MessageTypeDefinition
     GrpcGeneralHistogramData: MessageTypeDefinition
     GrpcGenericEnhancementBase: MessageTypeDefinition
-    GrpcGetAllContextValuesResult: MessageTypeDefinition
     GrpcGetAllSubscriptionsAndPipelinesResponse: MessageTypeDefinition
-    GrpcGetContextValueRequest: MessageTypeDefinition
+    GrpcGetCurrentContextValuesRequest: MessageTypeDefinition
     GrpcGraph: MessageTypeDefinition
     GrpcGraphEdge: MessageTypeDefinition
     GrpcGraphEdgeAdditionalData: MessageTypeDefinition
diff --git a/Ficus/src/go/grpcmodels/backend_service.pb.go b/Ficus/src/go/grpcmodels/backend_service.pb.go
index 89c3047ea..469254a32 100644
--- a/Ficus/src/go/grpcmodels/backend_service.pb.go
+++ b/Ficus/src/go/grpcmodels/backend_service.pb.go
@@ -214,58 +214,6 @@ func (x *GrpcPipelinePartDescriptor) GetName() string {
 	return ""
 }
 
-type GrpcGetContextValueRequest struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	ExecutionId   *GrpcGuid              `protobuf:"bytes,2,opt,name=executionId,proto3" json:"executionId,omitempty"`
-	Key           *GrpcContextKey        `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *GrpcGetContextValueRequest) Reset() {
-	*x = GrpcGetContextValueRequest{}
-	mi := &file_backend_service_proto_msgTypes[4]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *GrpcGetContextValueRequest) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GrpcGetContextValueRequest) ProtoMessage() {}
-
-func (x *GrpcGetContextValueRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_backend_service_proto_msgTypes[4]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GrpcGetContextValueRequest.ProtoReflect.Descriptor instead.
-func (*GrpcGetContextValueRequest) Descriptor() ([]byte, []int) {
-	return file_backend_service_proto_rawDescGZIP(), []int{4}
-}
-
-func (x *GrpcGetContextValueRequest) GetExecutionId() *GrpcGuid {
-	if x != nil {
-		return x.ExecutionId
-	}
-	return nil
-}
-
-func (x *GrpcGetContextValueRequest) GetKey() *GrpcContextKey {
-	if x != nil {
-		return x.Key
-	}
-	return nil
-}
-
 type GrpcPipelineExecutionRequest struct {
 	state          protoimpl.MessageState `protogen:"open.v1"`
 	Pipeline       *GrpcPipeline          `protobuf:"bytes,1,opt,name=pipeline,proto3" json:"pipeline,omitempty"`
@@ -276,7 +224,7 @@ type GrpcPipelineExecutionRequest struct {
 
 func (x *GrpcPipelineExecutionRequest) Reset() {
 	*x = GrpcPipelineExecutionRequest{}
-	mi := &file_backend_service_proto_msgTypes[5]
+	mi := &file_backend_service_proto_msgTypes[4]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -288,7 +236,7 @@ func (x *GrpcPipelineExecutionRequest) String() string {
 func (*GrpcPipelineExecutionRequest) ProtoMessage() {}
 
 func (x *GrpcPipelineExecutionRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_backend_service_proto_msgTypes[5]
+	mi := &file_backend_service_proto_msgTypes[4]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -301,7 +249,7 @@ func (x *GrpcPipelineExecutionRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcPipelineExecutionRequest.ProtoReflect.Descriptor instead.
 func (*GrpcPipelineExecutionRequest) Descriptor() ([]byte, []int) {
-	return file_backend_service_proto_rawDescGZIP(), []int{5}
+	return file_backend_service_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *GrpcPipelineExecutionRequest) GetPipeline() *GrpcPipeline {
@@ -328,7 +276,7 @@ type GrpcProxyPipelineExecutionRequest struct {
 
 func (x *GrpcProxyPipelineExecutionRequest) Reset() {
 	*x = GrpcProxyPipelineExecutionRequest{}
-	mi := &file_backend_service_proto_msgTypes[6]
+	mi := &file_backend_service_proto_msgTypes[5]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -340,7 +288,7 @@ func (x *GrpcProxyPipelineExecutionRequest) String() string {
 func (*GrpcProxyPipelineExecutionRequest) ProtoMessage() {}
 
 func (x *GrpcProxyPipelineExecutionRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_backend_service_proto_msgTypes[6]
+	mi := &file_backend_service_proto_msgTypes[5]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -353,7 +301,7 @@ func (x *GrpcProxyPipelineExecutionRequest) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use GrpcProxyPipelineExecutionRequest.ProtoReflect.Descriptor instead.
 func (*GrpcProxyPipelineExecutionRequest) Descriptor() ([]byte, []int) {
-	return file_backend_service_proto_rawDescGZIP(), []int{6}
+	return file_backend_service_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *GrpcProxyPipelineExecutionRequest) GetPipeline() *GrpcPipeline {
@@ -384,7 +332,7 @@ type GrpcPipelinePartExecutionResult struct {
 
 func (x *GrpcPipelinePartExecutionResult) Reset() {
 	*x = GrpcPipelinePartExecutionResult{}
-	mi := &file_backend_service_proto_msgTypes[7]
+	mi := &file_backend_service_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -396,7 +344,7 @@ func (x *GrpcPipelinePartExecutionResult) String() string {
 func (*GrpcPipelinePartExecutionResult) ProtoMessage() {}
 
 func (x *GrpcPipelinePartExecutionResult) ProtoReflect() protoreflect.Message {
-	mi := &file_backend_service_proto_msgTypes[7]
+	mi := &file_backend_service_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -409,7 +357,7 @@ func (x *GrpcPipelinePartExecutionResult) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcPipelinePartExecutionResult.ProtoReflect.Descriptor instead.
 func (*GrpcPipelinePartExecutionResult) Descriptor() ([]byte, []int) {
-	return file_backend_service_proto_rawDescGZIP(), []int{7}
+	return file_backend_service_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *GrpcPipelinePartExecutionResult) GetResult() isGrpcPipelinePartExecutionResult_Result {
@@ -478,7 +426,7 @@ type GrpcPipelinePartLogMessage struct {
 
 func (x *GrpcPipelinePartLogMessage) Reset() {
 	*x = GrpcPipelinePartLogMessage{}
-	mi := &file_backend_service_proto_msgTypes[8]
+	mi := &file_backend_service_proto_msgTypes[7]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -490,7 +438,7 @@ func (x *GrpcPipelinePartLogMessage) String() string {
 func (*GrpcPipelinePartLogMessage) ProtoMessage() {}
 
 func (x *GrpcPipelinePartLogMessage) ProtoReflect() protoreflect.Message {
-	mi := &file_backend_service_proto_msgTypes[8]
+	mi := &file_backend_service_proto_msgTypes[7]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -503,7 +451,7 @@ func (x *GrpcPipelinePartLogMessage) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcPipelinePartLogMessage.ProtoReflect.Descriptor instead.
 func (*GrpcPipelinePartLogMessage) Descriptor() ([]byte, []int) {
-	return file_backend_service_proto_rawDescGZIP(), []int{8}
+	return file_backend_service_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *GrpcPipelinePartLogMessage) GetMessage() string {
@@ -514,16 +462,17 @@ func (x *GrpcPipelinePartLogMessage) GetMessage() string {
 }
 
 type GrpcPipelinePartResult struct {
-	state         protoimpl.MessageState         `protogen:"open.v1"`
-	ContextValues []*GrpcContextValueWithKeyName `protobuf:"bytes,1,rep,name=contextValues,proto3" json:"contextValues,omitempty"`
-	Guid          *GrpcGuid                      `protobuf:"bytes,2,opt,name=guid,proto3" json:"guid,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
+	state            protoimpl.MessageState         `protogen:"open.v1"`
+	ContextValues    []*GrpcContextValueWithKeyName `protobuf:"bytes,1,rep,name=contextValues,proto3" json:"contextValues,omitempty"`
+	PipelinePartId   *GrpcGuid                      `protobuf:"bytes,2,opt,name=pipeline_part_id,json=pipelinePartId,proto3" json:"pipeline_part_id,omitempty"`
+	PipelinePartName string                         `protobuf:"bytes,3,opt,name=pipeline_part_name,json=pipelinePartName,proto3" json:"pipeline_part_name,omitempty"`
+	unknownFields    protoimpl.UnknownFields
+	sizeCache        protoimpl.SizeCache
 }
 
 func (x *GrpcPipelinePartResult) Reset() {
 	*x = GrpcPipelinePartResult{}
-	mi := &file_backend_service_proto_msgTypes[9]
+	mi := &file_backend_service_proto_msgTypes[8]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -535,7 +484,7 @@ func (x *GrpcPipelinePartResult) String() string {
 func (*GrpcPipelinePartResult) ProtoMessage() {}
 
 func (x *GrpcPipelinePartResult) ProtoReflect() protoreflect.Message {
-	mi := &file_backend_service_proto_msgTypes[9]
+	mi := &file_backend_service_proto_msgTypes[8]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -548,7 +497,7 @@ func (x *GrpcPipelinePartResult) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcPipelinePartResult.ProtoReflect.Descriptor instead.
 func (*GrpcPipelinePartResult) Descriptor() ([]byte, []int) {
-	return file_backend_service_proto_rawDescGZIP(), []int{9}
+	return file_backend_service_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *GrpcPipelinePartResult) GetContextValues() []*GrpcContextValueWithKeyName {
@@ -558,13 +507,20 @@ func (x *GrpcPipelinePartResult) GetContextValues() []*GrpcContextValueWithKeyNa
 	return nil
 }
 
-func (x *GrpcPipelinePartResult) GetGuid() *GrpcGuid {
+func (x *GrpcPipelinePartResult) GetPipelinePartId() *GrpcGuid {
 	if x != nil {
-		return x.Guid
+		return x.PipelinePartId
 	}
 	return nil
 }
 
+func (x *GrpcPipelinePartResult) GetPipelinePartName() string {
+	if x != nil {
+		return x.PipelinePartName
+	}
+	return ""
+}
+
 type GrpcPipelineFinalResult struct {
 	state protoimpl.MessageState `protogen:"open.v1"`
 	// Types that are valid to be assigned to ExecutionResult:
@@ -578,7 +534,7 @@ type GrpcPipelineFinalResult struct {
 
 func (x *GrpcPipelineFinalResult) Reset() {
 	*x = GrpcPipelineFinalResult{}
-	mi := &file_backend_service_proto_msgTypes[10]
+	mi := &file_backend_service_proto_msgTypes[9]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -590,7 +546,7 @@ func (x *GrpcPipelineFinalResult) String() string {
 func (*GrpcPipelineFinalResult) ProtoMessage() {}
 
 func (x *GrpcPipelineFinalResult) ProtoReflect() protoreflect.Message {
-	mi := &file_backend_service_proto_msgTypes[10]
+	mi := &file_backend_service_proto_msgTypes[9]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -603,7 +559,7 @@ func (x *GrpcPipelineFinalResult) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcPipelineFinalResult.ProtoReflect.Descriptor instead.
 func (*GrpcPipelineFinalResult) Descriptor() ([]byte, []int) {
-	return file_backend_service_proto_rawDescGZIP(), []int{10}
+	return file_backend_service_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *GrpcPipelineFinalResult) GetExecutionResult() isGrpcPipelineFinalResult_ExecutionResult {
@@ -647,50 +603,6 @@ func (*GrpcPipelineFinalResult_Success) isGrpcPipelineFinalResult_ExecutionResul
 
 func (*GrpcPipelineFinalResult_Error) isGrpcPipelineFinalResult_ExecutionResult() {}
 
-type GrpcGetAllContextValuesResult struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	ContextValues []*GrpcGuid            `protobuf:"bytes,1,rep,name=context_values,json=contextValues,proto3" json:"context_values,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *GrpcGetAllContextValuesResult) Reset() {
-	*x = GrpcGetAllContextValuesResult{}
-	mi := &file_backend_service_proto_msgTypes[11]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *GrpcGetAllContextValuesResult) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GrpcGetAllContextValuesResult) ProtoMessage() {}
-
-func (x *GrpcGetAllContextValuesResult) ProtoReflect() protoreflect.Message {
-	mi := &file_backend_service_proto_msgTypes[11]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GrpcGetAllContextValuesResult.ProtoReflect.Descriptor instead.
-func (*GrpcGetAllContextValuesResult) Descriptor() ([]byte, []int) {
-	return file_backend_service_proto_rawDescGZIP(), []int{11}
-}
-
-func (x *GrpcGetAllContextValuesResult) GetContextValues() []*GrpcGuid {
-	if x != nil {
-		return x.ContextValues
-	}
-	return nil
-}
-
 var File_backend_service_proto protoreflect.FileDescriptor
 
 const file_backend_service_proto_rawDesc = "" +
@@ -706,10 +618,7 @@ const file_backend_service_proto_rawDesc = "" +
 	"\x04name\x18\x01 \x01(\tR\x04name\x12H\n" +
 	"\x0epipeline_parts\x18\x02 \x03(\v2!.ficus.GrpcPipelinePartDescriptorR\rpipelineParts\"0\n" +
 	"\x1aGrpcPipelinePartDescriptor\x12\x12\n" +
-	"\x04name\x18\x01 \x01(\tR\x04name\"x\n" +
-	"\x1aGrpcGetContextValueRequest\x121\n" +
-	"\vexecutionId\x18\x02 \x01(\v2\x0f.ficus.GrpcGuidR\vexecutionId\x12'\n" +
-	"\x03key\x18\x01 \x01(\v2\x15.ficus.GrpcContextKeyR\x03key\"\x93\x01\n" +
+	"\x04name\x18\x01 \x01(\tR\x04name\"\x93\x01\n" +
 	"\x1cGrpcPipelineExecutionRequest\x12/\n" +
 	"\bpipeline\x18\x01 \x01(\v2\x13.ficus.GrpcPipelineR\bpipeline\x12B\n" +
 	"\x0einitialContext\x18\x02 \x03(\v2\x1a.ficus.GrpcContextKeyValueR\x0einitialContext\"\x91\x01\n" +
@@ -724,22 +633,19 @@ const file_backend_service_proto_rawDesc = "" +
 	"logMessageB\b\n" +
 	"\x06result\"6\n" +
 	"\x1aGrpcPipelinePartLogMessage\x12\x18\n" +
-	"\amessage\x18\x01 \x01(\tR\amessage\"\x87\x01\n" +
+	"\amessage\x18\x01 \x01(\tR\amessage\"\xcb\x01\n" +
 	"\x16GrpcPipelinePartResult\x12H\n" +
-	"\rcontextValues\x18\x01 \x03(\v2\".ficus.GrpcContextValueWithKeyNameR\rcontextValues\x12#\n" +
-	"\x04guid\x18\x02 \x01(\v2\x0f.ficus.GrpcGuidR\x04guid\"q\n" +
+	"\rcontextValues\x18\x01 \x03(\v2\".ficus.GrpcContextValueWithKeyNameR\rcontextValues\x129\n" +
+	"\x10pipeline_part_id\x18\x02 \x01(\v2\x0f.ficus.GrpcGuidR\x0epipelinePartId\x12,\n" +
+	"\x12pipeline_part_name\x18\x03 \x01(\tR\x10pipelinePartName\"q\n" +
 	"\x17GrpcPipelineFinalResult\x12+\n" +
 	"\asuccess\x18\x01 \x01(\v2\x0f.ficus.GrpcGuidH\x00R\asuccess\x12\x16\n" +
 	"\x05error\x18\x02 \x01(\tH\x00R\x05errorB\x11\n" +
-	"\x0fexecutionResult\"W\n" +
-	"\x1dGrpcGetAllContextValuesResult\x126\n" +
-	"\x0econtext_values\x18\x01 \x03(\v2\x0f.ficus.GrpcGuidR\rcontextValues2\x86\x01\n" +
+	"\x0fexecutionResult2\x86\x01\n" +
 	"\x1aGrpcBackendBalancerService\x12h\n" +
-	"\x1dSetPipelinePartsToBackendsMap\x12/.ficus.GrpcPredefinedPipelinePartsToBackendsMap\x1a\x16.google.protobuf.Empty2\x97\x03\n" +
+	"\x1dSetPipelinePartsToBackendsMap\x12/.ficus.GrpcPredefinedPipelinePartsToBackendsMap\x1a\x16.google.protobuf.Empty2\x82\x02\n" +
 	"\x12GrpcBackendService\x12e\n" +
-	"\x0fExecutePipeline\x12(.ficus.GrpcProxyPipelineExecutionRequest\x1a&.ficus.GrpcPipelinePartExecutionResult0\x01\x12E\n" +
-	"\x0fGetContextValue\x12!.ficus.GrpcGetContextValueRequest\x1a\x0f.ficus.GrpcGuid\x12L\n" +
-	"\x13GetAllContextValues\x12\x0f.ficus.GrpcGuid\x1a$.ficus.GrpcGetAllContextValuesResult\x12>\n" +
+	"\x0fExecutePipeline\x12(.ficus.GrpcProxyPipelineExecutionRequest\x1a&.ficus.GrpcPipelinePartExecutionResult0\x01\x12>\n" +
 	"\x13DropExecutionResult\x12\x0f.ficus.GrpcGuid\x1a\x16.google.protobuf.Empty\x12E\n" +
 	"\x0eGetBackendInfo\x12\x16.google.protobuf.Empty\x1a\x1b.ficus.GrpcFicusBackendInfoB\x0fZ\r./;grpcmodelsb\x06proto3"
 
@@ -755,60 +661,50 @@ func file_backend_service_proto_rawDescGZIP() []byte {
 	return file_backend_service_proto_rawDescData
 }
 
-var file_backend_service_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
+var file_backend_service_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
 var file_backend_service_proto_goTypes = []any{
 	(*GrpcPredefinedPipelinePartsToBackendsMap)(nil), // 0: ficus.GrpcPredefinedPipelinePartsToBackendsMap
 	(*GrpcPipelinePartToBackends)(nil),               // 1: ficus.GrpcPipelinePartToBackends
 	(*GrpcFicusBackendInfo)(nil),                     // 2: ficus.GrpcFicusBackendInfo
 	(*GrpcPipelinePartDescriptor)(nil),               // 3: ficus.GrpcPipelinePartDescriptor
-	(*GrpcGetContextValueRequest)(nil),               // 4: ficus.GrpcGetContextValueRequest
-	(*GrpcPipelineExecutionRequest)(nil),             // 5: ficus.GrpcPipelineExecutionRequest
-	(*GrpcProxyPipelineExecutionRequest)(nil),        // 6: ficus.GrpcProxyPipelineExecutionRequest
-	(*GrpcPipelinePartExecutionResult)(nil),          // 7: ficus.GrpcPipelinePartExecutionResult
-	(*GrpcPipelinePartLogMessage)(nil),               // 8: ficus.GrpcPipelinePartLogMessage
-	(*GrpcPipelinePartResult)(nil),                   // 9: ficus.GrpcPipelinePartResult
-	(*GrpcPipelineFinalResult)(nil),                  // 10: ficus.GrpcPipelineFinalResult
-	(*GrpcGetAllContextValuesResult)(nil),            // 11: ficus.GrpcGetAllContextValuesResult
+	(*GrpcPipelineExecutionRequest)(nil),             // 4: ficus.GrpcPipelineExecutionRequest
+	(*GrpcProxyPipelineExecutionRequest)(nil),        // 5: ficus.GrpcProxyPipelineExecutionRequest
+	(*GrpcPipelinePartExecutionResult)(nil),          // 6: ficus.GrpcPipelinePartExecutionResult
+	(*GrpcPipelinePartLogMessage)(nil),               // 7: ficus.GrpcPipelinePartLogMessage
+	(*GrpcPipelinePartResult)(nil),                   // 8: ficus.GrpcPipelinePartResult
+	(*GrpcPipelineFinalResult)(nil),                  // 9: ficus.GrpcPipelineFinalResult
+	(*GrpcPipeline)(nil),                             // 10: ficus.GrpcPipeline
+	(*GrpcContextKeyValue)(nil),                      // 11: ficus.GrpcContextKeyValue
 	(*GrpcGuid)(nil),                                 // 12: ficus.GrpcGuid
-	(*GrpcContextKey)(nil),                           // 13: ficus.GrpcContextKey
-	(*GrpcPipeline)(nil),                             // 14: ficus.GrpcPipeline
-	(*GrpcContextKeyValue)(nil),                      // 15: ficus.GrpcContextKeyValue
-	(*GrpcContextValueWithKeyName)(nil),              // 16: ficus.GrpcContextValueWithKeyName
-	(*emptypb.Empty)(nil),                            // 17: google.protobuf.Empty
+	(*GrpcContextValueWithKeyName)(nil),              // 13: ficus.GrpcContextValueWithKeyName
+	(*emptypb.Empty)(nil),                            // 14: google.protobuf.Empty
 }
 var file_backend_service_proto_depIdxs = []int32{
 	1,  // 0: ficus.GrpcPredefinedPipelinePartsToBackendsMap.parts_to_backends:type_name -> ficus.GrpcPipelinePartToBackends
 	3,  // 1: ficus.GrpcFicusBackendInfo.pipeline_parts:type_name -> ficus.GrpcPipelinePartDescriptor
-	12, // 2: ficus.GrpcGetContextValueRequest.executionId:type_name -> ficus.GrpcGuid
-	13, // 3: ficus.GrpcGetContextValueRequest.key:type_name -> ficus.GrpcContextKey
-	14, // 4: ficus.GrpcPipelineExecutionRequest.pipeline:type_name -> ficus.GrpcPipeline
-	15, // 5: ficus.GrpcPipelineExecutionRequest.initialContext:type_name -> ficus.GrpcContextKeyValue
-	14, // 6: ficus.GrpcProxyPipelineExecutionRequest.pipeline:type_name -> ficus.GrpcPipeline
-	12, // 7: ficus.GrpcProxyPipelineExecutionRequest.contextValuesIds:type_name -> ficus.GrpcGuid
-	10, // 8: ficus.GrpcPipelinePartExecutionResult.finalResult:type_name -> ficus.GrpcPipelineFinalResult
-	9,  // 9: ficus.GrpcPipelinePartExecutionResult.pipelinePartResult:type_name -> ficus.GrpcPipelinePartResult
-	8,  // 10: ficus.GrpcPipelinePartExecutionResult.logMessage:type_name -> ficus.GrpcPipelinePartLogMessage
-	16, // 11: ficus.GrpcPipelinePartResult.contextValues:type_name -> ficus.GrpcContextValueWithKeyName
-	12, // 12: ficus.GrpcPipelinePartResult.guid:type_name -> ficus.GrpcGuid
-	12, // 13: ficus.GrpcPipelineFinalResult.success:type_name -> ficus.GrpcGuid
-	12, // 14: ficus.GrpcGetAllContextValuesResult.context_values:type_name -> ficus.GrpcGuid
-	0,  // 15: ficus.GrpcBackendBalancerService.SetPipelinePartsToBackendsMap:input_type -> ficus.GrpcPredefinedPipelinePartsToBackendsMap
-	6,  // 16: ficus.GrpcBackendService.ExecutePipeline:input_type -> ficus.GrpcProxyPipelineExecutionRequest
-	4,  // 17: ficus.GrpcBackendService.GetContextValue:input_type -> ficus.GrpcGetContextValueRequest
-	12, // 18: ficus.GrpcBackendService.GetAllContextValues:input_type -> ficus.GrpcGuid
-	12, // 19: ficus.GrpcBackendService.DropExecutionResult:input_type -> ficus.GrpcGuid
-	17, // 20: ficus.GrpcBackendService.GetBackendInfo:input_type -> google.protobuf.Empty
-	17, // 21: ficus.GrpcBackendBalancerService.SetPipelinePartsToBackendsMap:output_type -> google.protobuf.Empty
-	7,  // 22: ficus.GrpcBackendService.ExecutePipeline:output_type -> ficus.GrpcPipelinePartExecutionResult
-	12, // 23: ficus.GrpcBackendService.GetContextValue:output_type -> ficus.GrpcGuid
-	11, // 24: ficus.GrpcBackendService.GetAllContextValues:output_type -> ficus.GrpcGetAllContextValuesResult
-	17, // 25: ficus.GrpcBackendService.DropExecutionResult:output_type -> google.protobuf.Empty
-	2,  // 26: ficus.GrpcBackendService.GetBackendInfo:output_type -> ficus.GrpcFicusBackendInfo
-	21, // [21:27] is the sub-list for method output_type
-	15, // [15:21] is the sub-list for method input_type
-	15, // [15:15] is the sub-list for extension type_name
-	15, // [15:15] is the sub-list for extension extendee
-	0,  // [0:15] is the sub-list for field type_name
+	10, // 2: ficus.GrpcPipelineExecutionRequest.pipeline:type_name -> ficus.GrpcPipeline
+	11, // 3: ficus.GrpcPipelineExecutionRequest.initialContext:type_name -> ficus.GrpcContextKeyValue
+	10, // 4: ficus.GrpcProxyPipelineExecutionRequest.pipeline:type_name -> ficus.GrpcPipeline
+	12, // 5: ficus.GrpcProxyPipelineExecutionRequest.contextValuesIds:type_name -> ficus.GrpcGuid
+	9,  // 6: ficus.GrpcPipelinePartExecutionResult.finalResult:type_name -> ficus.GrpcPipelineFinalResult
+	8,  // 7: ficus.GrpcPipelinePartExecutionResult.pipelinePartResult:type_name -> ficus.GrpcPipelinePartResult
+	7,  // 8: ficus.GrpcPipelinePartExecutionResult.logMessage:type_name -> ficus.GrpcPipelinePartLogMessage
+	13, // 9: ficus.GrpcPipelinePartResult.contextValues:type_name -> ficus.GrpcContextValueWithKeyName
+	12, // 10: ficus.GrpcPipelinePartResult.pipeline_part_id:type_name -> ficus.GrpcGuid
+	12, // 11: ficus.GrpcPipelineFinalResult.success:type_name -> ficus.GrpcGuid
+	0,  // 12: ficus.GrpcBackendBalancerService.SetPipelinePartsToBackendsMap:input_type -> ficus.GrpcPredefinedPipelinePartsToBackendsMap
+	5,  // 13: ficus.GrpcBackendService.ExecutePipeline:input_type -> ficus.GrpcProxyPipelineExecutionRequest
+	12, // 14: ficus.GrpcBackendService.DropExecutionResult:input_type -> ficus.GrpcGuid
+	14, // 15: ficus.GrpcBackendService.GetBackendInfo:input_type -> google.protobuf.Empty
+	14, // 16: ficus.GrpcBackendBalancerService.SetPipelinePartsToBackendsMap:output_type -> google.protobuf.Empty
+	6,  // 17: ficus.GrpcBackendService.ExecutePipeline:output_type -> ficus.GrpcPipelinePartExecutionResult
+	14, // 18: ficus.GrpcBackendService.DropExecutionResult:output_type -> google.protobuf.Empty
+	2,  // 19: ficus.GrpcBackendService.GetBackendInfo:output_type -> ficus.GrpcFicusBackendInfo
+	16, // [16:20] is the sub-list for method output_type
+	12, // [12:16] is the sub-list for method input_type
+	12, // [12:12] is the sub-list for extension type_name
+	12, // [12:12] is the sub-list for extension extendee
+	0,  // [0:12] is the sub-list for field type_name
 }
 
 func init() { file_backend_service_proto_init() }
@@ -818,12 +714,12 @@ func file_backend_service_proto_init() {
 	}
 	file_pipelines_and_context_proto_init()
 	file_util_proto_init()
-	file_backend_service_proto_msgTypes[7].OneofWrappers = []any{
+	file_backend_service_proto_msgTypes[6].OneofWrappers = []any{
 		(*GrpcPipelinePartExecutionResult_FinalResult)(nil),
 		(*GrpcPipelinePartExecutionResult_PipelinePartResult)(nil),
 		(*GrpcPipelinePartExecutionResult_LogMessage)(nil),
 	}
-	file_backend_service_proto_msgTypes[10].OneofWrappers = []any{
+	file_backend_service_proto_msgTypes[9].OneofWrappers = []any{
 		(*GrpcPipelineFinalResult_Success)(nil),
 		(*GrpcPipelineFinalResult_Error)(nil),
 	}
@@ -833,7 +729,7 @@ func file_backend_service_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_backend_service_proto_rawDesc), len(file_backend_service_proto_rawDesc)),
 			NumEnums:      0,
-			NumMessages:   12,
+			NumMessages:   10,
 			NumExtensions: 0,
 			NumServices:   2,
 		},
diff --git a/Ficus/src/go/grpcmodels/backend_service_grpc.pb.go b/Ficus/src/go/grpcmodels/backend_service_grpc.pb.go
index 768af832a..26827adf4 100644
--- a/Ficus/src/go/grpcmodels/backend_service_grpc.pb.go
+++ b/Ficus/src/go/grpcmodels/backend_service_grpc.pb.go
@@ -124,8 +124,6 @@ var GrpcBackendBalancerService_ServiceDesc = grpc.ServiceDesc{
 
 const (
 	GrpcBackendService_ExecutePipeline_FullMethodName     = "/ficus.GrpcBackendService/ExecutePipeline"
-	GrpcBackendService_GetContextValue_FullMethodName     = "/ficus.GrpcBackendService/GetContextValue"
-	GrpcBackendService_GetAllContextValues_FullMethodName = "/ficus.GrpcBackendService/GetAllContextValues"
 	GrpcBackendService_DropExecutionResult_FullMethodName = "/ficus.GrpcBackendService/DropExecutionResult"
 	GrpcBackendService_GetBackendInfo_FullMethodName      = "/ficus.GrpcBackendService/GetBackendInfo"
 )
@@ -135,8 +133,6 @@ const (
 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream.
 type GrpcBackendServiceClient interface {
 	ExecutePipeline(ctx context.Context, in *GrpcProxyPipelineExecutionRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[GrpcPipelinePartExecutionResult], error)
-	GetContextValue(ctx context.Context, in *GrpcGetContextValueRequest, opts ...grpc.CallOption) (*GrpcGuid, error)
-	GetAllContextValues(ctx context.Context, in *GrpcGuid, opts ...grpc.CallOption) (*GrpcGetAllContextValuesResult, error)
 	DropExecutionResult(ctx context.Context, in *GrpcGuid, opts ...grpc.CallOption) (*emptypb.Empty, error)
 	GetBackendInfo(ctx context.Context, in *emptypb.Empty, opts ...grpc.CallOption) (*GrpcFicusBackendInfo, error)
 }
@@ -168,26 +164,6 @@ func (c *grpcBackendServiceClient) ExecutePipeline(ctx context.Context, in *Grpc
 // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
 type GrpcBackendService_ExecutePipelineClient = grpc.ServerStreamingClient[GrpcPipelinePartExecutionResult]
 
-func (c *grpcBackendServiceClient) GetContextValue(ctx context.Context, in *GrpcGetContextValueRequest, opts ...grpc.CallOption) (*GrpcGuid, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(GrpcGuid)
-	err := c.cc.Invoke(ctx, GrpcBackendService_GetContextValue_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-func (c *grpcBackendServiceClient) GetAllContextValues(ctx context.Context, in *GrpcGuid, opts ...grpc.CallOption) (*GrpcGetAllContextValuesResult, error) {
-	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	out := new(GrpcGetAllContextValuesResult)
-	err := c.cc.Invoke(ctx, GrpcBackendService_GetAllContextValues_FullMethodName, in, out, cOpts...)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
 func (c *grpcBackendServiceClient) DropExecutionResult(ctx context.Context, in *GrpcGuid, opts ...grpc.CallOption) (*emptypb.Empty, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(emptypb.Empty)
@@ -213,8 +189,6 @@ func (c *grpcBackendServiceClient) GetBackendInfo(ctx context.Context, in *empty
 // for forward compatibility.
 type GrpcBackendServiceServer interface {
 	ExecutePipeline(*GrpcProxyPipelineExecutionRequest, grpc.ServerStreamingServer[GrpcPipelinePartExecutionResult]) error
-	GetContextValue(context.Context, *GrpcGetContextValueRequest) (*GrpcGuid, error)
-	GetAllContextValues(context.Context, *GrpcGuid) (*GrpcGetAllContextValuesResult, error)
 	DropExecutionResult(context.Context, *GrpcGuid) (*emptypb.Empty, error)
 	GetBackendInfo(context.Context, *emptypb.Empty) (*GrpcFicusBackendInfo, error)
 	mustEmbedUnimplementedGrpcBackendServiceServer()
@@ -230,12 +204,6 @@ type UnimplementedGrpcBackendServiceServer struct{}
 func (UnimplementedGrpcBackendServiceServer) ExecutePipeline(*GrpcProxyPipelineExecutionRequest, grpc.ServerStreamingServer[GrpcPipelinePartExecutionResult]) error {
 	return status.Errorf(codes.Unimplemented, "method ExecutePipeline not implemented")
 }
-func (UnimplementedGrpcBackendServiceServer) GetContextValue(context.Context, *GrpcGetContextValueRequest) (*GrpcGuid, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetContextValue not implemented")
-}
-func (UnimplementedGrpcBackendServiceServer) GetAllContextValues(context.Context, *GrpcGuid) (*GrpcGetAllContextValuesResult, error) {
-	return nil, status.Errorf(codes.Unimplemented, "method GetAllContextValues not implemented")
-}
 func (UnimplementedGrpcBackendServiceServer) DropExecutionResult(context.Context, *GrpcGuid) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DropExecutionResult not implemented")
 }
@@ -274,42 +242,6 @@ func _GrpcBackendService_ExecutePipeline_Handler(srv interface{}, stream grpc.Se
 // This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
 type GrpcBackendService_ExecutePipelineServer = grpc.ServerStreamingServer[GrpcPipelinePartExecutionResult]
 
-func _GrpcBackendService_GetContextValue_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GrpcGetContextValueRequest)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(GrpcBackendServiceServer).GetContextValue(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: GrpcBackendService_GetContextValue_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(GrpcBackendServiceServer).GetContextValue(ctx, req.(*GrpcGetContextValueRequest))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
-func _GrpcBackendService_GetAllContextValues_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
-	in := new(GrpcGuid)
-	if err := dec(in); err != nil {
-		return nil, err
-	}
-	if interceptor == nil {
-		return srv.(GrpcBackendServiceServer).GetAllContextValues(ctx, in)
-	}
-	info := &grpc.UnaryServerInfo{
-		Server:     srv,
-		FullMethod: GrpcBackendService_GetAllContextValues_FullMethodName,
-	}
-	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
-		return srv.(GrpcBackendServiceServer).GetAllContextValues(ctx, req.(*GrpcGuid))
-	}
-	return interceptor(ctx, in, info, handler)
-}
-
 func _GrpcBackendService_DropExecutionResult_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GrpcGuid)
 	if err := dec(in); err != nil {
@@ -353,14 +285,6 @@ var GrpcBackendService_ServiceDesc = grpc.ServiceDesc{
 	ServiceName: "ficus.GrpcBackendService",
 	HandlerType: (*GrpcBackendServiceServer)(nil),
 	Methods: []grpc.MethodDesc{
-		{
-			MethodName: "GetContextValue",
-			Handler:    _GrpcBackendService_GetContextValue_Handler,
-		},
-		{
-			MethodName: "GetAllContextValues",
-			Handler:    _GrpcBackendService_GetAllContextValues_Handler,
-		},
 		{
 			MethodName: "DropExecutionResult",
 			Handler:    _GrpcBackendService_DropExecutionResult_Handler,
diff --git a/Ficus/src/go/grpcmodels/context_values_service.pb.go b/Ficus/src/go/grpcmodels/context_values_service.pb.go
index 3a7c32569..cadafb96c 100644
--- a/Ficus/src/go/grpcmodels/context_values_service.pb.go
+++ b/Ficus/src/go/grpcmodels/context_values_service.pb.go
@@ -118,6 +118,102 @@ func (x *GrpcDropContextValuesRequest) GetIds() []*GrpcGuid {
 	return nil
 }
 
+type GrpcGetContextValueRequest struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ExecutionId   *GrpcGuid              `protobuf:"bytes,2,opt,name=executionId,proto3" json:"executionId,omitempty"`
+	Key           *GrpcContextKey        `protobuf:"bytes,1,opt,name=key,proto3" json:"key,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *GrpcGetContextValueRequest) Reset() {
+	*x = GrpcGetContextValueRequest{}
+	mi := &file_context_values_service_proto_msgTypes[2]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *GrpcGetContextValueRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GrpcGetContextValueRequest) ProtoMessage() {}
+
+func (x *GrpcGetContextValueRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_context_values_service_proto_msgTypes[2]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GrpcGetContextValueRequest.ProtoReflect.Descriptor instead.
+func (*GrpcGetContextValueRequest) Descriptor() ([]byte, []int) {
+	return file_context_values_service_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *GrpcGetContextValueRequest) GetExecutionId() *GrpcGuid {
+	if x != nil {
+		return x.ExecutionId
+	}
+	return nil
+}
+
+func (x *GrpcGetContextValueRequest) GetKey() *GrpcContextKey {
+	if x != nil {
+		return x.Key
+	}
+	return nil
+}
+
+type GrpcGetAllContextValuesResult struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	ContextValues []*GrpcGuid            `protobuf:"bytes,1,rep,name=context_values,json=contextValues,proto3" json:"context_values,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *GrpcGetAllContextValuesResult) Reset() {
+	*x = GrpcGetAllContextValuesResult{}
+	mi := &file_context_values_service_proto_msgTypes[3]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *GrpcGetAllContextValuesResult) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GrpcGetAllContextValuesResult) ProtoMessage() {}
+
+func (x *GrpcGetAllContextValuesResult) ProtoReflect() protoreflect.Message {
+	mi := &file_context_values_service_proto_msgTypes[3]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GrpcGetAllContextValuesResult.ProtoReflect.Descriptor instead.
+func (*GrpcGetAllContextValuesResult) Descriptor() ([]byte, []int) {
+	return file_context_values_service_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *GrpcGetAllContextValuesResult) GetContextValues() []*GrpcGuid {
+	if x != nil {
+		return x.ContextValues
+	}
+	return nil
+}
+
 var File_context_values_service_proto protoreflect.FileDescriptor
 
 const file_context_values_service_proto_rawDesc = "" +
@@ -128,11 +224,18 @@ const file_context_values_service_proto_rawDesc = "" +
 	"\x03key\x18\x02 \x01(\tR\x03key\x12\x14\n" +
 	"\x05bytes\x18\x03 \x01(\fR\x05bytes\"A\n" +
 	"\x1cGrpcDropContextValuesRequest\x12!\n" +
-	"\x03ids\x18\x01 \x03(\v2\x0f.ficus.GrpcGuidR\x03ids2\xf2\x01\n" +
+	"\x03ids\x18\x01 \x03(\v2\x0f.ficus.GrpcGuidR\x03ids\"x\n" +
+	"\x1aGrpcGetContextValueRequest\x121\n" +
+	"\vexecutionId\x18\x02 \x01(\v2\x0f.ficus.GrpcGuidR\vexecutionId\x12'\n" +
+	"\x03key\x18\x01 \x01(\v2\x15.ficus.GrpcContextKeyR\x03key\"W\n" +
+	"\x1dGrpcGetAllContextValuesResult\x126\n" +
+	"\x0econtext_values\x18\x01 \x03(\v2\x0f.ficus.GrpcGuidR\rcontextValues2\x8c\x03\n" +
 	"\x18GrpcContextValuesService\x12A\n" +
 	"\x0fSetContextValue\x12\x1b.ficus.GrpcContextValuePart\x1a\x0f.ficus.GrpcGuid(\x01\x12A\n" +
 	"\x0fGetContextValue\x12\x0f.ficus.GrpcGuid\x1a\x1b.ficus.GrpcContextValuePart0\x01\x12P\n" +
-	"\x11DropContextValues\x12#.ficus.GrpcDropContextValuesRequest\x1a\x16.google.protobuf.EmptyB\x0fZ\r./;grpcmodelsb\x06proto3"
+	"\x11DropContextValues\x12#.ficus.GrpcDropContextValuesRequest\x1a\x16.google.protobuf.Empty\x12G\n" +
+	"\x11GetContextValueId\x12!.ficus.GrpcGetContextValueRequest\x1a\x0f.ficus.GrpcGuid\x12O\n" +
+	"\x16GetAllContextValuesIds\x12\x0f.ficus.GrpcGuid\x1a$.ficus.GrpcGetAllContextValuesResultB\x0fZ\r./;grpcmodelsb\x06proto3"
 
 var (
 	file_context_values_service_proto_rawDescOnce sync.Once
@@ -146,26 +249,36 @@ func file_context_values_service_proto_rawDescGZIP() []byte {
 	return file_context_values_service_proto_rawDescData
 }
 
-var file_context_values_service_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_context_values_service_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
 var file_context_values_service_proto_goTypes = []any{
-	(*GrpcContextValuePart)(nil),         // 0: ficus.GrpcContextValuePart
-	(*GrpcDropContextValuesRequest)(nil), // 1: ficus.GrpcDropContextValuesRequest
-	(*GrpcGuid)(nil),                     // 2: ficus.GrpcGuid
-	(*emptypb.Empty)(nil),                // 3: google.protobuf.Empty
+	(*GrpcContextValuePart)(nil),          // 0: ficus.GrpcContextValuePart
+	(*GrpcDropContextValuesRequest)(nil),  // 1: ficus.GrpcDropContextValuesRequest
+	(*GrpcGetContextValueRequest)(nil),    // 2: ficus.GrpcGetContextValueRequest
+	(*GrpcGetAllContextValuesResult)(nil), // 3: ficus.GrpcGetAllContextValuesResult
+	(*GrpcGuid)(nil),                      // 4: ficus.GrpcGuid
+	(*GrpcContextKey)(nil),                // 5: ficus.GrpcContextKey
+	(*emptypb.Empty)(nil),                 // 6: google.protobuf.Empty
 }
 var file_context_values_service_proto_depIdxs = []int32{
-	2, // 0: ficus.GrpcDropContextValuesRequest.ids:type_name -> ficus.GrpcGuid
-	0, // 1: ficus.GrpcContextValuesService.SetContextValue:input_type -> ficus.GrpcContextValuePart
-	2, // 2: ficus.GrpcContextValuesService.GetContextValue:input_type -> ficus.GrpcGuid
-	1, // 3: ficus.GrpcContextValuesService.DropContextValues:input_type -> ficus.GrpcDropContextValuesRequest
-	2, // 4: ficus.GrpcContextValuesService.SetContextValue:output_type -> ficus.GrpcGuid
-	0, // 5: ficus.GrpcContextValuesService.GetContextValue:output_type -> ficus.GrpcContextValuePart
-	3, // 6: ficus.GrpcContextValuesService.DropContextValues:output_type -> google.protobuf.Empty
-	4, // [4:7] is the sub-list for method output_type
-	1, // [1:4] is the sub-list for method input_type
-	1, // [1:1] is the sub-list for extension type_name
-	1, // [1:1] is the sub-list for extension extendee
-	0, // [0:1] is the sub-list for field type_name
+	4, // 0: ficus.GrpcDropContextValuesRequest.ids:type_name -> ficus.GrpcGuid
+	4, // 1: ficus.GrpcGetContextValueRequest.executionId:type_name -> ficus.GrpcGuid
+	5, // 2: ficus.GrpcGetContextValueRequest.key:type_name -> ficus.GrpcContextKey
+	4, // 3: ficus.GrpcGetAllContextValuesResult.context_values:type_name -> ficus.GrpcGuid
+	0, // 4: ficus.GrpcContextValuesService.SetContextValue:input_type -> ficus.GrpcContextValuePart
+	4, // 5: ficus.GrpcContextValuesService.GetContextValue:input_type -> ficus.GrpcGuid
+	1, // 6: ficus.GrpcContextValuesService.DropContextValues:input_type -> ficus.GrpcDropContextValuesRequest
+	2, // 7: ficus.GrpcContextValuesService.GetContextValueId:input_type -> ficus.GrpcGetContextValueRequest
+	4, // 8: ficus.GrpcContextValuesService.GetAllContextValuesIds:input_type -> ficus.GrpcGuid
+	4, // 9: ficus.GrpcContextValuesService.SetContextValue:output_type -> ficus.GrpcGuid
+	0, // 10: ficus.GrpcContextValuesService.GetContextValue:output_type -> ficus.GrpcContextValuePart
+	6, // 11: ficus.GrpcContextValuesService.DropContextValues:output_type -> google.protobuf.Empty
+	4, // 12: ficus.GrpcContextValuesService.GetContextValueId:output_type -> ficus.GrpcGuid
+	3, // 13: ficus.GrpcContextValuesService.GetAllContextValuesIds:output_type -> ficus.GrpcGetAllContextValuesResult
+	9, // [9:14] is the sub-list for method output_type
+	4, // [4:9] is the sub-list for method input_type
+	4, // [4:4] is the sub-list for extension type_name
+	4, // [4:4] is the sub-list for extension extendee
+	0, // [0:4] is the sub-list for field type_name
 }
 
 func init() { file_context_values_service_proto_init() }
@@ -181,7 +294,7 @@ func file_context_values_service_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_context_values_service_proto_rawDesc), len(file_context_values_service_proto_rawDesc)),
 			NumEnums:      0,
-			NumMessages:   2,
+			NumMessages:   4,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/Ficus/src/go/grpcmodels/context_values_service_grpc.pb.go b/Ficus/src/go/grpcmodels/context_values_service_grpc.pb.go
index f9ee9ae2e..6d46c34be 100644
--- a/Ficus/src/go/grpcmodels/context_values_service_grpc.pb.go
+++ b/Ficus/src/go/grpcmodels/context_values_service_grpc.pb.go
@@ -20,9 +20,11 @@ import (
 const _ = grpc.SupportPackageIsVersion9
 
 const (
-	GrpcContextValuesService_SetContextValue_FullMethodName   = "/ficus.GrpcContextValuesService/SetContextValue"
-	GrpcContextValuesService_GetContextValue_FullMethodName   = "/ficus.GrpcContextValuesService/GetContextValue"
-	GrpcContextValuesService_DropContextValues_FullMethodName = "/ficus.GrpcContextValuesService/DropContextValues"
+	GrpcContextValuesService_SetContextValue_FullMethodName        = "/ficus.GrpcContextValuesService/SetContextValue"
+	GrpcContextValuesService_GetContextValue_FullMethodName        = "/ficus.GrpcContextValuesService/GetContextValue"
+	GrpcContextValuesService_DropContextValues_FullMethodName      = "/ficus.GrpcContextValuesService/DropContextValues"
+	GrpcContextValuesService_GetContextValueId_FullMethodName      = "/ficus.GrpcContextValuesService/GetContextValueId"
+	GrpcContextValuesService_GetAllContextValuesIds_FullMethodName = "/ficus.GrpcContextValuesService/GetAllContextValuesIds"
 )
 
 // GrpcContextValuesServiceClient is the client API for GrpcContextValuesService service.
@@ -32,6 +34,8 @@ type GrpcContextValuesServiceClient interface {
 	SetContextValue(ctx context.Context, opts ...grpc.CallOption) (grpc.ClientStreamingClient[GrpcContextValuePart, GrpcGuid], error)
 	GetContextValue(ctx context.Context, in *GrpcGuid, opts ...grpc.CallOption) (grpc.ServerStreamingClient[GrpcContextValuePart], error)
 	DropContextValues(ctx context.Context, in *GrpcDropContextValuesRequest, opts ...grpc.CallOption) (*emptypb.Empty, error)
+	GetContextValueId(ctx context.Context, in *GrpcGetContextValueRequest, opts ...grpc.CallOption) (*GrpcGuid, error)
+	GetAllContextValuesIds(ctx context.Context, in *GrpcGuid, opts ...grpc.CallOption) (*GrpcGetAllContextValuesResult, error)
 }
 
 type grpcContextValuesServiceClient struct {
@@ -84,6 +88,26 @@ func (c *grpcContextValuesServiceClient) DropContextValues(ctx context.Context,
 	return out, nil
 }
 
+func (c *grpcContextValuesServiceClient) GetContextValueId(ctx context.Context, in *GrpcGetContextValueRequest, opts ...grpc.CallOption) (*GrpcGuid, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(GrpcGuid)
+	err := c.cc.Invoke(ctx, GrpcContextValuesService_GetContextValueId_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
+func (c *grpcContextValuesServiceClient) GetAllContextValuesIds(ctx context.Context, in *GrpcGuid, opts ...grpc.CallOption) (*GrpcGetAllContextValuesResult, error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	out := new(GrpcGetAllContextValuesResult)
+	err := c.cc.Invoke(ctx, GrpcContextValuesService_GetAllContextValuesIds_FullMethodName, in, out, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	return out, nil
+}
+
 // GrpcContextValuesServiceServer is the server API for GrpcContextValuesService service.
 // All implementations must embed UnimplementedGrpcContextValuesServiceServer
 // for forward compatibility.
@@ -91,6 +115,8 @@ type GrpcContextValuesServiceServer interface {
 	SetContextValue(grpc.ClientStreamingServer[GrpcContextValuePart, GrpcGuid]) error
 	GetContextValue(*GrpcGuid, grpc.ServerStreamingServer[GrpcContextValuePart]) error
 	DropContextValues(context.Context, *GrpcDropContextValuesRequest) (*emptypb.Empty, error)
+	GetContextValueId(context.Context, *GrpcGetContextValueRequest) (*GrpcGuid, error)
+	GetAllContextValuesIds(context.Context, *GrpcGuid) (*GrpcGetAllContextValuesResult, error)
 	mustEmbedUnimplementedGrpcContextValuesServiceServer()
 }
 
@@ -110,6 +136,12 @@ func (UnimplementedGrpcContextValuesServiceServer) GetContextValue(*GrpcGuid, gr
 func (UnimplementedGrpcContextValuesServiceServer) DropContextValues(context.Context, *GrpcDropContextValuesRequest) (*emptypb.Empty, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method DropContextValues not implemented")
 }
+func (UnimplementedGrpcContextValuesServiceServer) GetContextValueId(context.Context, *GrpcGetContextValueRequest) (*GrpcGuid, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetContextValueId not implemented")
+}
+func (UnimplementedGrpcContextValuesServiceServer) GetAllContextValuesIds(context.Context, *GrpcGuid) (*GrpcGetAllContextValuesResult, error) {
+	return nil, status.Errorf(codes.Unimplemented, "method GetAllContextValuesIds not implemented")
+}
 func (UnimplementedGrpcContextValuesServiceServer) mustEmbedUnimplementedGrpcContextValuesServiceServer() {
 }
 func (UnimplementedGrpcContextValuesServiceServer) testEmbeddedByValue() {}
@@ -168,6 +200,42 @@ func _GrpcContextValuesService_DropContextValues_Handler(srv interface{}, ctx co
 	return interceptor(ctx, in, info, handler)
 }
 
+func _GrpcContextValuesService_GetContextValueId_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GrpcGetContextValueRequest)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GrpcContextValuesServiceServer).GetContextValueId(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GrpcContextValuesService_GetContextValueId_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GrpcContextValuesServiceServer).GetContextValueId(ctx, req.(*GrpcGetContextValueRequest))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
+func _GrpcContextValuesService_GetAllContextValuesIds_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
+	in := new(GrpcGuid)
+	if err := dec(in); err != nil {
+		return nil, err
+	}
+	if interceptor == nil {
+		return srv.(GrpcContextValuesServiceServer).GetAllContextValuesIds(ctx, in)
+	}
+	info := &grpc.UnaryServerInfo{
+		Server:     srv,
+		FullMethod: GrpcContextValuesService_GetAllContextValuesIds_FullMethodName,
+	}
+	handler := func(ctx context.Context, req interface{}) (interface{}, error) {
+		return srv.(GrpcContextValuesServiceServer).GetAllContextValuesIds(ctx, req.(*GrpcGuid))
+	}
+	return interceptor(ctx, in, info, handler)
+}
+
 // GrpcContextValuesService_ServiceDesc is the grpc.ServiceDesc for GrpcContextValuesService service.
 // It's only intended for direct use with grpc.RegisterService,
 // and not to be introspected or modified (even as a copy)
@@ -179,6 +247,14 @@ var GrpcContextValuesService_ServiceDesc = grpc.ServiceDesc{
 			MethodName: "DropContextValues",
 			Handler:    _GrpcContextValuesService_DropContextValues_Handler,
 		},
+		{
+			MethodName: "GetContextValueId",
+			Handler:    _GrpcContextValuesService_GetContextValueId_Handler,
+		},
+		{
+			MethodName: "GetAllContextValuesIds",
+			Handler:    _GrpcContextValuesService_GetAllContextValuesIds_Handler,
+		},
 	},
 	Streams: []grpc.StreamDesc{
 		{
diff --git a/Ficus/src/go/grpcmodels/front_contract.pb.go b/Ficus/src/go/grpcmodels/front_contract.pb.go
index 90ee27897..a36f8d180 100644
--- a/Ficus/src/go/grpcmodels/front_contract.pb.go
+++ b/Ficus/src/go/grpcmodels/front_contract.pb.go
@@ -188,10 +188,8 @@ func (x *GrpcGetPipelineCaseContextValuesRequest) GetCaseName() *GrpcCaseName {
 }
 
 type GrpcKafkaUpdate struct {
-	state               protoimpl.MessageState         `protogen:"open.v1"`
-	ProcessCaseMetadata *GrpcProcessCaseMetadata       `protobuf:"bytes,1,opt,name=processCaseMetadata,proto3" json:"processCaseMetadata,omitempty"`
-	PipelinePartInfo    *GrpcPipelinePartInfo          `protobuf:"bytes,2,opt,name=pipelinePartInfo,proto3" json:"pipelinePartInfo,omitempty"`
-	ContextValues       []*GrpcContextValueWithKeyName `protobuf:"bytes,3,rep,name=contextValues,proto3" json:"contextValues,omitempty"`
+	state               protoimpl.MessageState   `protogen:"open.v1"`
+	ProcessCaseMetadata *GrpcProcessCaseMetadata `protobuf:"bytes,1,opt,name=processCaseMetadata,proto3" json:"processCaseMetadata,omitempty"`
 	unknownFields       protoimpl.UnknownFields
 	sizeCache           protoimpl.SizeCache
 }
@@ -233,14 +231,104 @@ func (x *GrpcKafkaUpdate) GetProcessCaseMetadata() *GrpcProcessCaseMetadata {
 	return nil
 }
 
-func (x *GrpcKafkaUpdate) GetPipelinePartInfo() *GrpcPipelinePartInfo {
+type GrpcPipelinePartInfo struct {
+	state         protoimpl.MessageState `protogen:"open.v1"`
+	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
+	Id            *GrpcGuid              `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	ExecutionId   *GrpcGuid              `protobuf:"bytes,3,opt,name=execution_id,json=executionId,proto3" json:"execution_id,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *GrpcPipelinePartInfo) Reset() {
+	*x = GrpcPipelinePartInfo{}
+	mi := &file_front_contract_proto_msgTypes[4]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *GrpcPipelinePartInfo) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GrpcPipelinePartInfo) ProtoMessage() {}
+
+func (x *GrpcPipelinePartInfo) ProtoReflect() protoreflect.Message {
+	mi := &file_front_contract_proto_msgTypes[4]
 	if x != nil {
-		return x.PipelinePartInfo
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GrpcPipelinePartInfo.ProtoReflect.Descriptor instead.
+func (*GrpcPipelinePartInfo) Descriptor() ([]byte, []int) {
+	return file_front_contract_proto_rawDescGZIP(), []int{4}
+}
+
+func (x *GrpcPipelinePartInfo) GetName() string {
+	if x != nil {
+		return x.Name
+	}
+	return ""
+}
+
+func (x *GrpcPipelinePartInfo) GetId() *GrpcGuid {
+	if x != nil {
+		return x.Id
+	}
+	return nil
+}
+
+func (x *GrpcPipelinePartInfo) GetExecutionId() *GrpcGuid {
+	if x != nil {
+		return x.ExecutionId
 	}
 	return nil
 }
 
-func (x *GrpcKafkaUpdate) GetContextValues() []*GrpcContextValueWithKeyName {
+type GrpcKafkaContextValues struct {
+	state         protoimpl.MessageState         `protogen:"open.v1"`
+	ContextValues []*GrpcContextValueWithKeyName `protobuf:"bytes,1,rep,name=contextValues,proto3" json:"contextValues,omitempty"`
+	unknownFields protoimpl.UnknownFields
+	sizeCache     protoimpl.SizeCache
+}
+
+func (x *GrpcKafkaContextValues) Reset() {
+	*x = GrpcKafkaContextValues{}
+	mi := &file_front_contract_proto_msgTypes[5]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *GrpcKafkaContextValues) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GrpcKafkaContextValues) ProtoMessage() {}
+
+func (x *GrpcKafkaContextValues) ProtoReflect() protoreflect.Message {
+	mi := &file_front_contract_proto_msgTypes[5]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GrpcKafkaContextValues.ProtoReflect.Descriptor instead.
+func (*GrpcKafkaContextValues) Descriptor() ([]byte, []int) {
+	return file_front_contract_proto_rawDescGZIP(), []int{5}
+}
+
+func (x *GrpcKafkaContextValues) GetContextValues() []*GrpcContextValueWithKeyName {
 	if x != nil {
 		return x.ContextValues
 	}
@@ -262,7 +350,7 @@ type GrpcProcessCaseMetadata struct {
 
 func (x *GrpcProcessCaseMetadata) Reset() {
 	*x = GrpcProcessCaseMetadata{}
-	mi := &file_front_contract_proto_msgTypes[4]
+	mi := &file_front_contract_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -274,7 +362,7 @@ func (x *GrpcProcessCaseMetadata) String() string {
 func (*GrpcProcessCaseMetadata) ProtoMessage() {}
 
 func (x *GrpcProcessCaseMetadata) ProtoReflect() protoreflect.Message {
-	mi := &file_front_contract_proto_msgTypes[4]
+	mi := &file_front_contract_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -287,7 +375,7 @@ func (x *GrpcProcessCaseMetadata) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcProcessCaseMetadata.ProtoReflect.Descriptor instead.
 func (*GrpcProcessCaseMetadata) Descriptor() ([]byte, []int) {
-	return file_front_contract_proto_rawDescGZIP(), []int{4}
+	return file_front_contract_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *GrpcProcessCaseMetadata) GetProcessName() string {
@@ -349,7 +437,7 @@ type GrpcCaseName struct {
 
 func (x *GrpcCaseName) Reset() {
 	*x = GrpcCaseName{}
-	mi := &file_front_contract_proto_msgTypes[5]
+	mi := &file_front_contract_proto_msgTypes[7]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -361,7 +449,7 @@ func (x *GrpcCaseName) String() string {
 func (*GrpcCaseName) ProtoMessage() {}
 
 func (x *GrpcCaseName) ProtoReflect() protoreflect.Message {
-	mi := &file_front_contract_proto_msgTypes[5]
+	mi := &file_front_contract_proto_msgTypes[7]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -374,7 +462,7 @@ func (x *GrpcCaseName) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcCaseName.ProtoReflect.Descriptor instead.
 func (*GrpcCaseName) Descriptor() ([]byte, []int) {
-	return file_front_contract_proto_rawDescGZIP(), []int{5}
+	return file_front_contract_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *GrpcCaseName) GetDisplayName() string {
@@ -401,7 +489,7 @@ type GrpcCaseContextValues struct {
 
 func (x *GrpcCaseContextValues) Reset() {
 	*x = GrpcCaseContextValues{}
-	mi := &file_front_contract_proto_msgTypes[6]
+	mi := &file_front_contract_proto_msgTypes[8]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -413,7 +501,7 @@ func (x *GrpcCaseContextValues) String() string {
 func (*GrpcCaseContextValues) ProtoMessage() {}
 
 func (x *GrpcCaseContextValues) ProtoReflect() protoreflect.Message {
-	mi := &file_front_contract_proto_msgTypes[6]
+	mi := &file_front_contract_proto_msgTypes[8]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -426,7 +514,7 @@ func (x *GrpcCaseContextValues) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcCaseContextValues.ProtoReflect.Descriptor instead.
 func (*GrpcCaseContextValues) Descriptor() ([]byte, []int) {
-	return file_front_contract_proto_rawDescGZIP(), []int{6}
+	return file_front_contract_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *GrpcCaseContextValues) GetContextValues() []*GrpcPipelinePartContextValues {
@@ -454,7 +542,7 @@ type GrpcPipelinePartContextValues struct {
 
 func (x *GrpcPipelinePartContextValues) Reset() {
 	*x = GrpcPipelinePartContextValues{}
-	mi := &file_front_contract_proto_msgTypes[7]
+	mi := &file_front_contract_proto_msgTypes[9]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -466,7 +554,7 @@ func (x *GrpcPipelinePartContextValues) String() string {
 func (*GrpcPipelinePartContextValues) ProtoMessage() {}
 
 func (x *GrpcPipelinePartContextValues) ProtoReflect() protoreflect.Message {
-	mi := &file_front_contract_proto_msgTypes[7]
+	mi := &file_front_contract_proto_msgTypes[9]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -479,7 +567,7 @@ func (x *GrpcPipelinePartContextValues) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcPipelinePartContextValues.ProtoReflect.Descriptor instead.
 func (*GrpcPipelinePartContextValues) Descriptor() ([]byte, []int) {
-	return file_front_contract_proto_rawDescGZIP(), []int{7}
+	return file_front_contract_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *GrpcPipelinePartContextValues) GetPipelinePartInfo() *GrpcPipelinePartInfo {
@@ -512,7 +600,7 @@ type GrpcCasePipelinePartExecutionResult struct {
 
 func (x *GrpcCasePipelinePartExecutionResult) Reset() {
 	*x = GrpcCasePipelinePartExecutionResult{}
-	mi := &file_front_contract_proto_msgTypes[8]
+	mi := &file_front_contract_proto_msgTypes[10]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -524,7 +612,7 @@ func (x *GrpcCasePipelinePartExecutionResult) String() string {
 func (*GrpcCasePipelinePartExecutionResult) ProtoMessage() {}
 
 func (x *GrpcCasePipelinePartExecutionResult) ProtoReflect() protoreflect.Message {
-	mi := &file_front_contract_proto_msgTypes[8]
+	mi := &file_front_contract_proto_msgTypes[10]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -537,7 +625,7 @@ func (x *GrpcCasePipelinePartExecutionResult) ProtoReflect() protoreflect.Messag
 
 // Deprecated: Use GrpcCasePipelinePartExecutionResult.ProtoReflect.Descriptor instead.
 func (*GrpcCasePipelinePartExecutionResult) Descriptor() ([]byte, []int) {
-	return file_front_contract_proto_rawDescGZIP(), []int{8}
+	return file_front_contract_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *GrpcCasePipelinePartExecutionResult) GetContextValues() []*GrpcContextValueWithKeyName {
@@ -547,66 +635,6 @@ func (x *GrpcCasePipelinePartExecutionResult) GetContextValues() []*GrpcContextV
 	return nil
 }
 
-type GrpcPipelinePartInfo struct {
-	state         protoimpl.MessageState `protogen:"open.v1"`
-	Name          string                 `protobuf:"bytes,1,opt,name=name,proto3" json:"name,omitempty"`
-	Id            *GrpcGuid              `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
-	ExecutionId   *GrpcGuid              `protobuf:"bytes,3,opt,name=execution_id,json=executionId,proto3" json:"execution_id,omitempty"`
-	unknownFields protoimpl.UnknownFields
-	sizeCache     protoimpl.SizeCache
-}
-
-func (x *GrpcPipelinePartInfo) Reset() {
-	*x = GrpcPipelinePartInfo{}
-	mi := &file_front_contract_proto_msgTypes[9]
-	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-	ms.StoreMessageInfo(mi)
-}
-
-func (x *GrpcPipelinePartInfo) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GrpcPipelinePartInfo) ProtoMessage() {}
-
-func (x *GrpcPipelinePartInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_front_contract_proto_msgTypes[9]
-	if x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use GrpcPipelinePartInfo.ProtoReflect.Descriptor instead.
-func (*GrpcPipelinePartInfo) Descriptor() ([]byte, []int) {
-	return file_front_contract_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *GrpcPipelinePartInfo) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *GrpcPipelinePartInfo) GetId() *GrpcGuid {
-	if x != nil {
-		return x.Id
-	}
-	return nil
-}
-
-func (x *GrpcPipelinePartInfo) GetExecutionId() *GrpcGuid {
-	if x != nil {
-		return x.ExecutionId
-	}
-	return nil
-}
-
 var File_front_contract_proto protoreflect.FileDescriptor
 
 const file_front_contract_proto_rawDesc = "" +
@@ -624,11 +652,15 @@ const file_front_contract_proto_rawDesc = "" +
 	"pipelineId\x18\x02 \x01(\v2\x0f.ficus.GrpcGuidR\n" +
 	"pipelineId\x12 \n" +
 	"\vprocessName\x18\x03 \x01(\tR\vprocessName\x12/\n" +
-	"\bcaseName\x18\x04 \x01(\v2\x13.ficus.GrpcCaseNameR\bcaseName\"\xf6\x01\n" +
+	"\bcaseName\x18\x04 \x01(\v2\x13.ficus.GrpcCaseNameR\bcaseName\"c\n" +
 	"\x0fGrpcKafkaUpdate\x12P\n" +
-	"\x13processCaseMetadata\x18\x01 \x01(\v2\x1e.ficus.GrpcProcessCaseMetadataR\x13processCaseMetadata\x12G\n" +
-	"\x10pipelinePartInfo\x18\x02 \x01(\v2\x1b.ficus.GrpcPipelinePartInfoR\x10pipelinePartInfo\x12H\n" +
-	"\rcontextValues\x18\x03 \x03(\v2\".ficus.GrpcContextValueWithKeyNameR\rcontextValues\"\xdd\x02\n" +
+	"\x13processCaseMetadata\x18\x01 \x01(\v2\x1e.ficus.GrpcProcessCaseMetadataR\x13processCaseMetadata\"\x7f\n" +
+	"\x14GrpcPipelinePartInfo\x12\x12\n" +
+	"\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n" +
+	"\x02id\x18\x02 \x01(\v2\x0f.ficus.GrpcGuidR\x02id\x122\n" +
+	"\fexecution_id\x18\x03 \x01(\v2\x0f.ficus.GrpcGuidR\vexecutionId\"b\n" +
+	"\x16GrpcKafkaContextValues\x12H\n" +
+	"\rcontextValues\x18\x01 \x03(\v2\".ficus.GrpcContextValueWithKeyNameR\rcontextValues\"\xdd\x02\n" +
 	"\x17GrpcProcessCaseMetadata\x12 \n" +
 	"\vprocessName\x18\x01 \x01(\tR\vprocessName\x12/\n" +
 	"\bcaseName\x18\x02 \x01(\v2\x13.ficus.GrpcCaseNameR\bcaseName\x127\n" +
@@ -650,11 +682,7 @@ const file_front_contract_proto_rawDesc = "" +
 	"\x05stamp\x18\x02 \x01(\v2\x1a.google.protobuf.TimestampR\x05stamp\x12W\n" +
 	"\x11execution_results\x18\x03 \x03(\v2*.ficus.GrpcCasePipelinePartExecutionResultR\x10executionResults\"o\n" +
 	"#GrpcCasePipelinePartExecutionResult\x12H\n" +
-	"\rcontextValues\x18\x03 \x03(\v2\".ficus.GrpcContextValueWithKeyNameR\rcontextValues\"\x7f\n" +
-	"\x14GrpcPipelinePartInfo\x12\x12\n" +
-	"\x04name\x18\x01 \x01(\tR\x04name\x12\x1f\n" +
-	"\x02id\x18\x02 \x01(\v2\x0f.ficus.GrpcGuidR\x02id\x122\n" +
-	"\fexecution_id\x18\x03 \x01(\v2\x0f.ficus.GrpcGuidR\vexecutionId2\x82\x02\n" +
+	"\rcontextValues\x18\x03 \x03(\v2\".ficus.GrpcContextValueWithKeyNameR\rcontextValues2\x82\x02\n" +
 	"%GrpcPipelinePartsContextValuesService\x12l\n" +
 	" GetSubscriptionAndPipelinesState\x12\x16.google.protobuf.Empty\x1a0.ficus.GrpcSubscriptionAndPipelinesStateResponse\x12k\n" +
 	"\x1bGetPipelineCaseContextValue\x12..ficus.GrpcGetPipelineCaseContextValuesRequest\x1a\x1c.ficus.GrpcCaseContextValuesB\x0fZ\r./;grpcmodelsb\x06proto3"
@@ -671,53 +699,53 @@ func file_front_contract_proto_rawDescGZIP() []byte {
 	return file_front_contract_proto_rawDescData
 }
 
-var file_front_contract_proto_msgTypes = make([]protoimpl.MessageInfo, 10)
+var file_front_contract_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
 var file_front_contract_proto_goTypes = []any{
 	(*GrpcSubscriptionAndPipelinesStateResponse)(nil), // 0: ficus.GrpcSubscriptionAndPipelinesStateResponse
 	(*GrpcProcessCaseMetadataWithStamp)(nil),          // 1: ficus.GrpcProcessCaseMetadataWithStamp
 	(*GrpcGetPipelineCaseContextValuesRequest)(nil),   // 2: ficus.GrpcGetPipelineCaseContextValuesRequest
 	(*GrpcKafkaUpdate)(nil),                           // 3: ficus.GrpcKafkaUpdate
-	(*GrpcProcessCaseMetadata)(nil),                   // 4: ficus.GrpcProcessCaseMetadata
-	(*GrpcCaseName)(nil),                              // 5: ficus.GrpcCaseName
-	(*GrpcCaseContextValues)(nil),                     // 6: ficus.GrpcCaseContextValues
-	(*GrpcPipelinePartContextValues)(nil),             // 7: ficus.GrpcPipelinePartContextValues
-	(*GrpcCasePipelinePartExecutionResult)(nil),       // 8: ficus.GrpcCasePipelinePartExecutionResult
-	(*GrpcPipelinePartInfo)(nil),                      // 9: ficus.GrpcPipelinePartInfo
-	(*GrpcGuid)(nil),                                  // 10: ficus.GrpcGuid
-	(*GrpcContextValueWithKeyName)(nil),               // 11: ficus.GrpcContextValueWithKeyName
-	(*GrpcStringKeyValue)(nil),                        // 12: ficus.GrpcStringKeyValue
-	(*timestamppb.Timestamp)(nil),                     // 13: google.protobuf.Timestamp
-	(*emptypb.Empty)(nil),                             // 14: google.protobuf.Empty
+	(*GrpcPipelinePartInfo)(nil),                      // 4: ficus.GrpcPipelinePartInfo
+	(*GrpcKafkaContextValues)(nil),                    // 5: ficus.GrpcKafkaContextValues
+	(*GrpcProcessCaseMetadata)(nil),                   // 6: ficus.GrpcProcessCaseMetadata
+	(*GrpcCaseName)(nil),                              // 7: ficus.GrpcCaseName
+	(*GrpcCaseContextValues)(nil),                     // 8: ficus.GrpcCaseContextValues
+	(*GrpcPipelinePartContextValues)(nil),             // 9: ficus.GrpcPipelinePartContextValues
+	(*GrpcCasePipelinePartExecutionResult)(nil),       // 10: ficus.GrpcCasePipelinePartExecutionResult
+	(*GrpcGuid)(nil),                                  // 11: ficus.GrpcGuid
+	(*GrpcContextValueWithKeyName)(nil),               // 12: ficus.GrpcContextValueWithKeyName
+	(*GrpcStringKeyValue)(nil),                        // 13: ficus.GrpcStringKeyValue
+	(*timestamppb.Timestamp)(nil),                     // 14: google.protobuf.Timestamp
+	(*emptypb.Empty)(nil),                             // 15: google.protobuf.Empty
 }
 var file_front_contract_proto_depIdxs = []int32{
 	1,  // 0: ficus.GrpcSubscriptionAndPipelinesStateResponse.cases:type_name -> ficus.GrpcProcessCaseMetadataWithStamp
-	4,  // 1: ficus.GrpcProcessCaseMetadataWithStamp.metadata:type_name -> ficus.GrpcProcessCaseMetadata
-	10, // 2: ficus.GrpcGetPipelineCaseContextValuesRequest.subscriptionId:type_name -> ficus.GrpcGuid
-	10, // 3: ficus.GrpcGetPipelineCaseContextValuesRequest.pipelineId:type_name -> ficus.GrpcGuid
-	5,  // 4: ficus.GrpcGetPipelineCaseContextValuesRequest.caseName:type_name -> ficus.GrpcCaseName
-	4,  // 5: ficus.GrpcKafkaUpdate.processCaseMetadata:type_name -> ficus.GrpcProcessCaseMetadata
-	9,  // 6: ficus.GrpcKafkaUpdate.pipelinePartInfo:type_name -> ficus.GrpcPipelinePartInfo
-	11, // 7: ficus.GrpcKafkaUpdate.contextValues:type_name -> ficus.GrpcContextValueWithKeyName
-	5,  // 8: ficus.GrpcProcessCaseMetadata.caseName:type_name -> ficus.GrpcCaseName
-	10, // 9: ficus.GrpcProcessCaseMetadata.subscriptionId:type_name -> ficus.GrpcGuid
-	10, // 10: ficus.GrpcProcessCaseMetadata.pipelineId:type_name -> ficus.GrpcGuid
-	12, // 11: ficus.GrpcProcessCaseMetadata.metadata:type_name -> ficus.GrpcStringKeyValue
-	7,  // 12: ficus.GrpcCaseContextValues.contextValues:type_name -> ficus.GrpcPipelinePartContextValues
-	9,  // 13: ficus.GrpcPipelinePartContextValues.pipelinePartInfo:type_name -> ficus.GrpcPipelinePartInfo
-	13, // 14: ficus.GrpcPipelinePartContextValues.stamp:type_name -> google.protobuf.Timestamp
-	8,  // 15: ficus.GrpcPipelinePartContextValues.execution_results:type_name -> ficus.GrpcCasePipelinePartExecutionResult
-	11, // 16: ficus.GrpcCasePipelinePartExecutionResult.contextValues:type_name -> ficus.GrpcContextValueWithKeyName
-	10, // 17: ficus.GrpcPipelinePartInfo.id:type_name -> ficus.GrpcGuid
-	10, // 18: ficus.GrpcPipelinePartInfo.execution_id:type_name -> ficus.GrpcGuid
-	14, // 19: ficus.GrpcPipelinePartsContextValuesService.GetSubscriptionAndPipelinesState:input_type -> google.protobuf.Empty
-	2,  // 20: ficus.GrpcPipelinePartsContextValuesService.GetPipelineCaseContextValue:input_type -> ficus.GrpcGetPipelineCaseContextValuesRequest
-	0,  // 21: ficus.GrpcPipelinePartsContextValuesService.GetSubscriptionAndPipelinesState:output_type -> ficus.GrpcSubscriptionAndPipelinesStateResponse
-	6,  // 22: ficus.GrpcPipelinePartsContextValuesService.GetPipelineCaseContextValue:output_type -> ficus.GrpcCaseContextValues
-	21, // [21:23] is the sub-list for method output_type
-	19, // [19:21] is the sub-list for method input_type
-	19, // [19:19] is the sub-list for extension type_name
-	19, // [19:19] is the sub-list for extension extendee
-	0,  // [0:19] is the sub-list for field type_name
+	6,  // 1: ficus.GrpcProcessCaseMetadataWithStamp.metadata:type_name -> ficus.GrpcProcessCaseMetadata
+	11, // 2: ficus.GrpcGetPipelineCaseContextValuesRequest.subscriptionId:type_name -> ficus.GrpcGuid
+	11, // 3: ficus.GrpcGetPipelineCaseContextValuesRequest.pipelineId:type_name -> ficus.GrpcGuid
+	7,  // 4: ficus.GrpcGetPipelineCaseContextValuesRequest.caseName:type_name -> ficus.GrpcCaseName
+	6,  // 5: ficus.GrpcKafkaUpdate.processCaseMetadata:type_name -> ficus.GrpcProcessCaseMetadata
+	11, // 6: ficus.GrpcPipelinePartInfo.id:type_name -> ficus.GrpcGuid
+	11, // 7: ficus.GrpcPipelinePartInfo.execution_id:type_name -> ficus.GrpcGuid
+	12, // 8: ficus.GrpcKafkaContextValues.contextValues:type_name -> ficus.GrpcContextValueWithKeyName
+	7,  // 9: ficus.GrpcProcessCaseMetadata.caseName:type_name -> ficus.GrpcCaseName
+	11, // 10: ficus.GrpcProcessCaseMetadata.subscriptionId:type_name -> ficus.GrpcGuid
+	11, // 11: ficus.GrpcProcessCaseMetadata.pipelineId:type_name -> ficus.GrpcGuid
+	13, // 12: ficus.GrpcProcessCaseMetadata.metadata:type_name -> ficus.GrpcStringKeyValue
+	9,  // 13: ficus.GrpcCaseContextValues.contextValues:type_name -> ficus.GrpcPipelinePartContextValues
+	4,  // 14: ficus.GrpcPipelinePartContextValues.pipelinePartInfo:type_name -> ficus.GrpcPipelinePartInfo
+	14, // 15: ficus.GrpcPipelinePartContextValues.stamp:type_name -> google.protobuf.Timestamp
+	10, // 16: ficus.GrpcPipelinePartContextValues.execution_results:type_name -> ficus.GrpcCasePipelinePartExecutionResult
+	12, // 17: ficus.GrpcCasePipelinePartExecutionResult.contextValues:type_name -> ficus.GrpcContextValueWithKeyName
+	15, // 18: ficus.GrpcPipelinePartsContextValuesService.GetSubscriptionAndPipelinesState:input_type -> google.protobuf.Empty
+	2,  // 19: ficus.GrpcPipelinePartsContextValuesService.GetPipelineCaseContextValue:input_type -> ficus.GrpcGetPipelineCaseContextValuesRequest
+	0,  // 20: ficus.GrpcPipelinePartsContextValuesService.GetSubscriptionAndPipelinesState:output_type -> ficus.GrpcSubscriptionAndPipelinesStateResponse
+	8,  // 21: ficus.GrpcPipelinePartsContextValuesService.GetPipelineCaseContextValue:output_type -> ficus.GrpcCaseContextValues
+	20, // [20:22] is the sub-list for method output_type
+	18, // [18:20] is the sub-list for method input_type
+	18, // [18:18] is the sub-list for extension type_name
+	18, // [18:18] is the sub-list for extension extendee
+	0,  // [0:18] is the sub-list for field type_name
 }
 
 func init() { file_front_contract_proto_init() }
@@ -733,7 +761,7 @@ func file_front_contract_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_front_contract_proto_rawDesc), len(file_front_contract_proto_rawDesc)),
 			NumEnums:      0,
-			NumMessages:   10,
+			NumMessages:   11,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/Ficus/src/go/grpcmodels/kafka_service.pb.go b/Ficus/src/go/grpcmodels/kafka_service.pb.go
index 34dab22cd..42fbc5b5d 100644
--- a/Ficus/src/go/grpcmodels/kafka_service.pb.go
+++ b/Ficus/src/go/grpcmodels/kafka_service.pb.go
@@ -22,6 +22,66 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
+type GrpcGetCurrentContextValuesRequest struct {
+	state          protoimpl.MessageState `protogen:"open.v1"`
+	SubscriptionId *GrpcGuid              `protobuf:"bytes,1,opt,name=subscriptionId,proto3" json:"subscriptionId,omitempty"`
+	PipelineId     *GrpcGuid              `protobuf:"bytes,2,opt,name=pipelineId,proto3" json:"pipelineId,omitempty"`
+	CaseName       string                 `protobuf:"bytes,3,opt,name=caseName,proto3" json:"caseName,omitempty"`
+	unknownFields  protoimpl.UnknownFields
+	sizeCache      protoimpl.SizeCache
+}
+
+func (x *GrpcGetCurrentContextValuesRequest) Reset() {
+	*x = GrpcGetCurrentContextValuesRequest{}
+	mi := &file_kafka_service_proto_msgTypes[0]
+	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+	ms.StoreMessageInfo(mi)
+}
+
+func (x *GrpcGetCurrentContextValuesRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GrpcGetCurrentContextValuesRequest) ProtoMessage() {}
+
+func (x *GrpcGetCurrentContextValuesRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_kafka_service_proto_msgTypes[0]
+	if x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GrpcGetCurrentContextValuesRequest.ProtoReflect.Descriptor instead.
+func (*GrpcGetCurrentContextValuesRequest) Descriptor() ([]byte, []int) {
+	return file_kafka_service_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *GrpcGetCurrentContextValuesRequest) GetSubscriptionId() *GrpcGuid {
+	if x != nil {
+		return x.SubscriptionId
+	}
+	return nil
+}
+
+func (x *GrpcGetCurrentContextValuesRequest) GetPipelineId() *GrpcGuid {
+	if x != nil {
+		return x.PipelineId
+	}
+	return nil
+}
+
+func (x *GrpcGetCurrentContextValuesRequest) GetCaseName() string {
+	if x != nil {
+		return x.CaseName
+	}
+	return ""
+}
+
 type GrpcExecutePipelineAndProduceKafkaRequest struct {
 	state            protoimpl.MessageState             `protogen:"open.v1"`
 	PipelineRequest  *GrpcProxyPipelineExecutionRequest `protobuf:"bytes,1,opt,name=pipelineRequest,proto3" json:"pipelineRequest,omitempty"`
@@ -37,7 +97,7 @@ type GrpcExecutePipelineAndProduceKafkaRequest struct {
 
 func (x *GrpcExecutePipelineAndProduceKafkaRequest) Reset() {
 	*x = GrpcExecutePipelineAndProduceKafkaRequest{}
-	mi := &file_kafka_service_proto_msgTypes[0]
+	mi := &file_kafka_service_proto_msgTypes[1]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -49,7 +109,7 @@ func (x *GrpcExecutePipelineAndProduceKafkaRequest) String() string {
 func (*GrpcExecutePipelineAndProduceKafkaRequest) ProtoMessage() {}
 
 func (x *GrpcExecutePipelineAndProduceKafkaRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[0]
+	mi := &file_kafka_service_proto_msgTypes[1]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -62,7 +122,7 @@ func (x *GrpcExecutePipelineAndProduceKafkaRequest) ProtoReflect() protoreflect.
 
 // Deprecated: Use GrpcExecutePipelineAndProduceKafkaRequest.ProtoReflect.Descriptor instead.
 func (*GrpcExecutePipelineAndProduceKafkaRequest) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{0}
+	return file_kafka_service_proto_rawDescGZIP(), []int{1}
 }
 
 func (x *GrpcExecutePipelineAndProduceKafkaRequest) GetPipelineRequest() *GrpcProxyPipelineExecutionRequest {
@@ -124,7 +184,7 @@ type GrpcProcessInfo struct {
 
 func (x *GrpcProcessInfo) Reset() {
 	*x = GrpcProcessInfo{}
-	mi := &file_kafka_service_proto_msgTypes[1]
+	mi := &file_kafka_service_proto_msgTypes[2]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -136,7 +196,7 @@ func (x *GrpcProcessInfo) String() string {
 func (*GrpcProcessInfo) ProtoMessage() {}
 
 func (x *GrpcProcessInfo) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[1]
+	mi := &file_kafka_service_proto_msgTypes[2]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -149,7 +209,7 @@ func (x *GrpcProcessInfo) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcProcessInfo.ProtoReflect.Descriptor instead.
 func (*GrpcProcessInfo) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{1}
+	return file_kafka_service_proto_rawDescGZIP(), []int{2}
 }
 
 func (x *GrpcProcessInfo) GetProcessName() string {
@@ -176,7 +236,7 @@ type GrpcSubscribeToKafkaRequest struct {
 
 func (x *GrpcSubscribeToKafkaRequest) Reset() {
 	*x = GrpcSubscribeToKafkaRequest{}
-	mi := &file_kafka_service_proto_msgTypes[2]
+	mi := &file_kafka_service_proto_msgTypes[3]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -188,7 +248,7 @@ func (x *GrpcSubscribeToKafkaRequest) String() string {
 func (*GrpcSubscribeToKafkaRequest) ProtoMessage() {}
 
 func (x *GrpcSubscribeToKafkaRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[2]
+	mi := &file_kafka_service_proto_msgTypes[3]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -201,7 +261,7 @@ func (x *GrpcSubscribeToKafkaRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcSubscribeToKafkaRequest.ProtoReflect.Descriptor instead.
 func (*GrpcSubscribeToKafkaRequest) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{2}
+	return file_kafka_service_proto_rawDescGZIP(), []int{3}
 }
 
 func (x *GrpcSubscribeToKafkaRequest) GetConnectionMetadata() *GrpcKafkaConnectionMetadata {
@@ -227,7 +287,7 @@ type GrpcKafkaSubscriptionMetadata struct {
 
 func (x *GrpcKafkaSubscriptionMetadata) Reset() {
 	*x = GrpcKafkaSubscriptionMetadata{}
-	mi := &file_kafka_service_proto_msgTypes[3]
+	mi := &file_kafka_service_proto_msgTypes[4]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -239,7 +299,7 @@ func (x *GrpcKafkaSubscriptionMetadata) String() string {
 func (*GrpcKafkaSubscriptionMetadata) ProtoMessage() {}
 
 func (x *GrpcKafkaSubscriptionMetadata) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[3]
+	mi := &file_kafka_service_proto_msgTypes[4]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -252,7 +312,7 @@ func (x *GrpcKafkaSubscriptionMetadata) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcKafkaSubscriptionMetadata.ProtoReflect.Descriptor instead.
 func (*GrpcKafkaSubscriptionMetadata) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{3}
+	return file_kafka_service_proto_rawDescGZIP(), []int{4}
 }
 
 func (x *GrpcKafkaSubscriptionMetadata) GetSubscriptionName() string {
@@ -274,7 +334,7 @@ type GrpcKafkaPipelineExecutionRequest struct {
 
 func (x *GrpcKafkaPipelineExecutionRequest) Reset() {
 	*x = GrpcKafkaPipelineExecutionRequest{}
-	mi := &file_kafka_service_proto_msgTypes[4]
+	mi := &file_kafka_service_proto_msgTypes[5]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -286,7 +346,7 @@ func (x *GrpcKafkaPipelineExecutionRequest) String() string {
 func (*GrpcKafkaPipelineExecutionRequest) ProtoMessage() {}
 
 func (x *GrpcKafkaPipelineExecutionRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[4]
+	mi := &file_kafka_service_proto_msgTypes[5]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -299,7 +359,7 @@ func (x *GrpcKafkaPipelineExecutionRequest) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use GrpcKafkaPipelineExecutionRequest.ProtoReflect.Descriptor instead.
 func (*GrpcKafkaPipelineExecutionRequest) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{4}
+	return file_kafka_service_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *GrpcKafkaPipelineExecutionRequest) GetSubscriptionId() *GrpcGuid {
@@ -339,7 +399,7 @@ type GrpcPipelineMetadata struct {
 
 func (x *GrpcPipelineMetadata) Reset() {
 	*x = GrpcPipelineMetadata{}
-	mi := &file_kafka_service_proto_msgTypes[5]
+	mi := &file_kafka_service_proto_msgTypes[6]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -351,7 +411,7 @@ func (x *GrpcPipelineMetadata) String() string {
 func (*GrpcPipelineMetadata) ProtoMessage() {}
 
 func (x *GrpcPipelineMetadata) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[5]
+	mi := &file_kafka_service_proto_msgTypes[6]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -364,7 +424,7 @@ func (x *GrpcPipelineMetadata) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcPipelineMetadata.ProtoReflect.Descriptor instead.
 func (*GrpcPipelineMetadata) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{5}
+	return file_kafka_service_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *GrpcPipelineMetadata) GetName() string {
@@ -384,7 +444,7 @@ type GrpcAddPipelineRequest struct {
 
 func (x *GrpcAddPipelineRequest) Reset() {
 	*x = GrpcAddPipelineRequest{}
-	mi := &file_kafka_service_proto_msgTypes[6]
+	mi := &file_kafka_service_proto_msgTypes[7]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -396,7 +456,7 @@ func (x *GrpcAddPipelineRequest) String() string {
 func (*GrpcAddPipelineRequest) ProtoMessage() {}
 
 func (x *GrpcAddPipelineRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[6]
+	mi := &file_kafka_service_proto_msgTypes[7]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -409,7 +469,7 @@ func (x *GrpcAddPipelineRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcAddPipelineRequest.ProtoReflect.Descriptor instead.
 func (*GrpcAddPipelineRequest) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{6}
+	return file_kafka_service_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *GrpcAddPipelineRequest) GetPipelineRequest() *GrpcKafkaPipelineExecutionRequest {
@@ -440,7 +500,7 @@ type GrpcPipelineStreamingConfiguration struct {
 
 func (x *GrpcPipelineStreamingConfiguration) Reset() {
 	*x = GrpcPipelineStreamingConfiguration{}
-	mi := &file_kafka_service_proto_msgTypes[7]
+	mi := &file_kafka_service_proto_msgTypes[8]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -452,7 +512,7 @@ func (x *GrpcPipelineStreamingConfiguration) String() string {
 func (*GrpcPipelineStreamingConfiguration) ProtoMessage() {}
 
 func (x *GrpcPipelineStreamingConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[7]
+	mi := &file_kafka_service_proto_msgTypes[8]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -465,7 +525,7 @@ func (x *GrpcPipelineStreamingConfiguration) ProtoReflect() protoreflect.Message
 
 // Deprecated: Use GrpcPipelineStreamingConfiguration.ProtoReflect.Descriptor instead.
 func (*GrpcPipelineStreamingConfiguration) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{7}
+	return file_kafka_service_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *GrpcPipelineStreamingConfiguration) GetConfiguration() isGrpcPipelineStreamingConfiguration_Configuration {
@@ -541,7 +601,7 @@ type GrpcT1StreamingConfiguration struct {
 
 func (x *GrpcT1StreamingConfiguration) Reset() {
 	*x = GrpcT1StreamingConfiguration{}
-	mi := &file_kafka_service_proto_msgTypes[8]
+	mi := &file_kafka_service_proto_msgTypes[9]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -553,7 +613,7 @@ func (x *GrpcT1StreamingConfiguration) String() string {
 func (*GrpcT1StreamingConfiguration) ProtoMessage() {}
 
 func (x *GrpcT1StreamingConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[8]
+	mi := &file_kafka_service_proto_msgTypes[9]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -566,7 +626,7 @@ func (x *GrpcT1StreamingConfiguration) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcT1StreamingConfiguration.ProtoReflect.Descriptor instead.
 func (*GrpcT1StreamingConfiguration) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{8}
+	return file_kafka_service_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *GrpcT1StreamingConfiguration) GetConfiguration() isGrpcT1StreamingConfiguration_Configuration {
@@ -635,7 +695,7 @@ type GrpcT1TracesQueueConfiguration struct {
 
 func (x *GrpcT1TracesQueueConfiguration) Reset() {
 	*x = GrpcT1TracesQueueConfiguration{}
-	mi := &file_kafka_service_proto_msgTypes[9]
+	mi := &file_kafka_service_proto_msgTypes[10]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -647,7 +707,7 @@ func (x *GrpcT1TracesQueueConfiguration) String() string {
 func (*GrpcT1TracesQueueConfiguration) ProtoMessage() {}
 
 func (x *GrpcT1TracesQueueConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[9]
+	mi := &file_kafka_service_proto_msgTypes[10]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -660,7 +720,7 @@ func (x *GrpcT1TracesQueueConfiguration) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcT1TracesQueueConfiguration.ProtoReflect.Descriptor instead.
 func (*GrpcT1TracesQueueConfiguration) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{9}
+	return file_kafka_service_proto_rawDescGZIP(), []int{10}
 }
 
 func (x *GrpcT1TracesQueueConfiguration) GetQueueCapacity() int64 {
@@ -679,7 +739,7 @@ type GrpcT1EventsTimeBasedCaching struct {
 
 func (x *GrpcT1EventsTimeBasedCaching) Reset() {
 	*x = GrpcT1EventsTimeBasedCaching{}
-	mi := &file_kafka_service_proto_msgTypes[10]
+	mi := &file_kafka_service_proto_msgTypes[11]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -691,7 +751,7 @@ func (x *GrpcT1EventsTimeBasedCaching) String() string {
 func (*GrpcT1EventsTimeBasedCaching) ProtoMessage() {}
 
 func (x *GrpcT1EventsTimeBasedCaching) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[10]
+	mi := &file_kafka_service_proto_msgTypes[11]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -704,7 +764,7 @@ func (x *GrpcT1EventsTimeBasedCaching) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcT1EventsTimeBasedCaching.ProtoReflect.Descriptor instead.
 func (*GrpcT1EventsTimeBasedCaching) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{10}
+	return file_kafka_service_proto_rawDescGZIP(), []int{11}
 }
 
 func (x *GrpcT1EventsTimeBasedCaching) GetEventsTimeoutMs() int64 {
@@ -723,7 +783,7 @@ type GrpcT1TraceTimeBasedCaching struct {
 
 func (x *GrpcT1TraceTimeBasedCaching) Reset() {
 	*x = GrpcT1TraceTimeBasedCaching{}
-	mi := &file_kafka_service_proto_msgTypes[11]
+	mi := &file_kafka_service_proto_msgTypes[12]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -735,7 +795,7 @@ func (x *GrpcT1TraceTimeBasedCaching) String() string {
 func (*GrpcT1TraceTimeBasedCaching) ProtoMessage() {}
 
 func (x *GrpcT1TraceTimeBasedCaching) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[11]
+	mi := &file_kafka_service_proto_msgTypes[12]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -748,7 +808,7 @@ func (x *GrpcT1TraceTimeBasedCaching) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcT1TraceTimeBasedCaching.ProtoReflect.Descriptor instead.
 func (*GrpcT1TraceTimeBasedCaching) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{11}
+	return file_kafka_service_proto_rawDescGZIP(), []int{12}
 }
 
 func (x *GrpcT1TraceTimeBasedCaching) GetTracesTimeoutMs() int64 {
@@ -772,7 +832,7 @@ type GrpcT2StreamingConfiguration struct {
 
 func (x *GrpcT2StreamingConfiguration) Reset() {
 	*x = GrpcT2StreamingConfiguration{}
-	mi := &file_kafka_service_proto_msgTypes[12]
+	mi := &file_kafka_service_proto_msgTypes[13]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -784,7 +844,7 @@ func (x *GrpcT2StreamingConfiguration) String() string {
 func (*GrpcT2StreamingConfiguration) ProtoMessage() {}
 
 func (x *GrpcT2StreamingConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[12]
+	mi := &file_kafka_service_proto_msgTypes[13]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -797,7 +857,7 @@ func (x *GrpcT2StreamingConfiguration) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcT2StreamingConfiguration.ProtoReflect.Descriptor instead.
 func (*GrpcT2StreamingConfiguration) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{12}
+	return file_kafka_service_proto_rawDescGZIP(), []int{13}
 }
 
 func (x *GrpcT2StreamingConfiguration) GetConfiguration() isGrpcT2StreamingConfiguration_Configuration {
@@ -859,7 +919,7 @@ type GrpcT2LossyCountConfiguration struct {
 
 func (x *GrpcT2LossyCountConfiguration) Reset() {
 	*x = GrpcT2LossyCountConfiguration{}
-	mi := &file_kafka_service_proto_msgTypes[13]
+	mi := &file_kafka_service_proto_msgTypes[14]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -871,7 +931,7 @@ func (x *GrpcT2LossyCountConfiguration) String() string {
 func (*GrpcT2LossyCountConfiguration) ProtoMessage() {}
 
 func (x *GrpcT2LossyCountConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[13]
+	mi := &file_kafka_service_proto_msgTypes[14]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -884,7 +944,7 @@ func (x *GrpcT2LossyCountConfiguration) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcT2LossyCountConfiguration.ProtoReflect.Descriptor instead.
 func (*GrpcT2LossyCountConfiguration) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{13}
+	return file_kafka_service_proto_rawDescGZIP(), []int{14}
 }
 
 func (x *GrpcT2LossyCountConfiguration) GetError() float64 {
@@ -910,7 +970,7 @@ type GrpcT2TimedSlidingWindowConfiguration struct {
 
 func (x *GrpcT2TimedSlidingWindowConfiguration) Reset() {
 	*x = GrpcT2TimedSlidingWindowConfiguration{}
-	mi := &file_kafka_service_proto_msgTypes[14]
+	mi := &file_kafka_service_proto_msgTypes[15]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -922,7 +982,7 @@ func (x *GrpcT2TimedSlidingWindowConfiguration) String() string {
 func (*GrpcT2TimedSlidingWindowConfiguration) ProtoMessage() {}
 
 func (x *GrpcT2TimedSlidingWindowConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[14]
+	mi := &file_kafka_service_proto_msgTypes[15]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -935,7 +995,7 @@ func (x *GrpcT2TimedSlidingWindowConfiguration) ProtoReflect() protoreflect.Mess
 
 // Deprecated: Use GrpcT2TimedSlidingWindowConfiguration.ProtoReflect.Descriptor instead.
 func (*GrpcT2TimedSlidingWindowConfiguration) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{14}
+	return file_kafka_service_proto_rawDescGZIP(), []int{15}
 }
 
 func (x *GrpcT2TimedSlidingWindowConfiguration) GetLifespanMs() int64 {
@@ -954,7 +1014,7 @@ type GrpcAddPipelineStreamRequest struct {
 
 func (x *GrpcAddPipelineStreamRequest) Reset() {
 	*x = GrpcAddPipelineStreamRequest{}
-	mi := &file_kafka_service_proto_msgTypes[15]
+	mi := &file_kafka_service_proto_msgTypes[16]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -966,7 +1026,7 @@ func (x *GrpcAddPipelineStreamRequest) String() string {
 func (*GrpcAddPipelineStreamRequest) ProtoMessage() {}
 
 func (x *GrpcAddPipelineStreamRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[15]
+	mi := &file_kafka_service_proto_msgTypes[16]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -979,7 +1039,7 @@ func (x *GrpcAddPipelineStreamRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcAddPipelineStreamRequest.ProtoReflect.Descriptor instead.
 func (*GrpcAddPipelineStreamRequest) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{15}
+	return file_kafka_service_proto_rawDescGZIP(), []int{16}
 }
 
 func (x *GrpcAddPipelineStreamRequest) GetPipelineRequest() *GrpcKafkaPipelineExecutionRequest {
@@ -999,7 +1059,7 @@ type GrpcRemovePipelineRequest struct {
 
 func (x *GrpcRemovePipelineRequest) Reset() {
 	*x = GrpcRemovePipelineRequest{}
-	mi := &file_kafka_service_proto_msgTypes[16]
+	mi := &file_kafka_service_proto_msgTypes[17]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1011,7 +1071,7 @@ func (x *GrpcRemovePipelineRequest) String() string {
 func (*GrpcRemovePipelineRequest) ProtoMessage() {}
 
 func (x *GrpcRemovePipelineRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[16]
+	mi := &file_kafka_service_proto_msgTypes[17]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1024,7 +1084,7 @@ func (x *GrpcRemovePipelineRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcRemovePipelineRequest.ProtoReflect.Descriptor instead.
 func (*GrpcRemovePipelineRequest) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{16}
+	return file_kafka_service_proto_rawDescGZIP(), []int{17}
 }
 
 func (x *GrpcRemovePipelineRequest) GetSubscriptionId() *GrpcGuid {
@@ -1050,7 +1110,7 @@ type GrpcRemoveAllPipelinesRequest struct {
 
 func (x *GrpcRemoveAllPipelinesRequest) Reset() {
 	*x = GrpcRemoveAllPipelinesRequest{}
-	mi := &file_kafka_service_proto_msgTypes[17]
+	mi := &file_kafka_service_proto_msgTypes[18]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1062,7 +1122,7 @@ func (x *GrpcRemoveAllPipelinesRequest) String() string {
 func (*GrpcRemoveAllPipelinesRequest) ProtoMessage() {}
 
 func (x *GrpcRemoveAllPipelinesRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[17]
+	mi := &file_kafka_service_proto_msgTypes[18]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1075,7 +1135,7 @@ func (x *GrpcRemoveAllPipelinesRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcRemoveAllPipelinesRequest.ProtoReflect.Descriptor instead.
 func (*GrpcRemoveAllPipelinesRequest) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{17}
+	return file_kafka_service_proto_rawDescGZIP(), []int{18}
 }
 
 func (x *GrpcRemoveAllPipelinesRequest) GetSubscriptionId() *GrpcGuid {
@@ -1095,7 +1155,7 @@ type GrpcKafkaConnectionMetadata struct {
 
 func (x *GrpcKafkaConnectionMetadata) Reset() {
 	*x = GrpcKafkaConnectionMetadata{}
-	mi := &file_kafka_service_proto_msgTypes[18]
+	mi := &file_kafka_service_proto_msgTypes[19]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1107,7 +1167,7 @@ func (x *GrpcKafkaConnectionMetadata) String() string {
 func (*GrpcKafkaConnectionMetadata) ProtoMessage() {}
 
 func (x *GrpcKafkaConnectionMetadata) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[18]
+	mi := &file_kafka_service_proto_msgTypes[19]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1120,7 +1180,7 @@ func (x *GrpcKafkaConnectionMetadata) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcKafkaConnectionMetadata.ProtoReflect.Descriptor instead.
 func (*GrpcKafkaConnectionMetadata) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{18}
+	return file_kafka_service_proto_rawDescGZIP(), []int{19}
 }
 
 func (x *GrpcKafkaConnectionMetadata) GetTopicName() string {
@@ -1147,7 +1207,7 @@ type GrpcKafkaMetadata struct {
 
 func (x *GrpcKafkaMetadata) Reset() {
 	*x = GrpcKafkaMetadata{}
-	mi := &file_kafka_service_proto_msgTypes[19]
+	mi := &file_kafka_service_proto_msgTypes[20]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1159,7 +1219,7 @@ func (x *GrpcKafkaMetadata) String() string {
 func (*GrpcKafkaMetadata) ProtoMessage() {}
 
 func (x *GrpcKafkaMetadata) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[19]
+	mi := &file_kafka_service_proto_msgTypes[20]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1172,7 +1232,7 @@ func (x *GrpcKafkaMetadata) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcKafkaMetadata.ProtoReflect.Descriptor instead.
 func (*GrpcKafkaMetadata) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{19}
+	return file_kafka_service_proto_rawDescGZIP(), []int{20}
 }
 
 func (x *GrpcKafkaMetadata) GetKey() string {
@@ -1202,7 +1262,7 @@ type GrpcKafkaResult struct {
 
 func (x *GrpcKafkaResult) Reset() {
 	*x = GrpcKafkaResult{}
-	mi := &file_kafka_service_proto_msgTypes[20]
+	mi := &file_kafka_service_proto_msgTypes[21]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1214,7 +1274,7 @@ func (x *GrpcKafkaResult) String() string {
 func (*GrpcKafkaResult) ProtoMessage() {}
 
 func (x *GrpcKafkaResult) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[20]
+	mi := &file_kafka_service_proto_msgTypes[21]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1227,7 +1287,7 @@ func (x *GrpcKafkaResult) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcKafkaResult.ProtoReflect.Descriptor instead.
 func (*GrpcKafkaResult) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{20}
+	return file_kafka_service_proto_rawDescGZIP(), []int{21}
 }
 
 func (x *GrpcKafkaResult) GetResult() isGrpcKafkaResult_Result {
@@ -1280,7 +1340,7 @@ type GrpcKafkaSuccessResult struct {
 
 func (x *GrpcKafkaSuccessResult) Reset() {
 	*x = GrpcKafkaSuccessResult{}
-	mi := &file_kafka_service_proto_msgTypes[21]
+	mi := &file_kafka_service_proto_msgTypes[22]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1292,7 +1352,7 @@ func (x *GrpcKafkaSuccessResult) String() string {
 func (*GrpcKafkaSuccessResult) ProtoMessage() {}
 
 func (x *GrpcKafkaSuccessResult) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[21]
+	mi := &file_kafka_service_proto_msgTypes[22]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1305,7 +1365,7 @@ func (x *GrpcKafkaSuccessResult) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcKafkaSuccessResult.ProtoReflect.Descriptor instead.
 func (*GrpcKafkaSuccessResult) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{21}
+	return file_kafka_service_proto_rawDescGZIP(), []int{22}
 }
 
 func (x *GrpcKafkaSuccessResult) GetId() *GrpcGuid {
@@ -1324,7 +1384,7 @@ type GrpcKafkaFailedResult struct {
 
 func (x *GrpcKafkaFailedResult) Reset() {
 	*x = GrpcKafkaFailedResult{}
-	mi := &file_kafka_service_proto_msgTypes[22]
+	mi := &file_kafka_service_proto_msgTypes[23]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1336,7 +1396,7 @@ func (x *GrpcKafkaFailedResult) String() string {
 func (*GrpcKafkaFailedResult) ProtoMessage() {}
 
 func (x *GrpcKafkaFailedResult) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[22]
+	mi := &file_kafka_service_proto_msgTypes[23]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1349,7 +1409,7 @@ func (x *GrpcKafkaFailedResult) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcKafkaFailedResult.ProtoReflect.Descriptor instead.
 func (*GrpcKafkaFailedResult) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{22}
+	return file_kafka_service_proto_rawDescGZIP(), []int{23}
 }
 
 func (x *GrpcKafkaFailedResult) GetErrorMessage() string {
@@ -1368,7 +1428,7 @@ type GrpcUnsubscribeFromKafkaRequest struct {
 
 func (x *GrpcUnsubscribeFromKafkaRequest) Reset() {
 	*x = GrpcUnsubscribeFromKafkaRequest{}
-	mi := &file_kafka_service_proto_msgTypes[23]
+	mi := &file_kafka_service_proto_msgTypes[24]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1380,7 +1440,7 @@ func (x *GrpcUnsubscribeFromKafkaRequest) String() string {
 func (*GrpcUnsubscribeFromKafkaRequest) ProtoMessage() {}
 
 func (x *GrpcUnsubscribeFromKafkaRequest) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[23]
+	mi := &file_kafka_service_proto_msgTypes[24]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1393,7 +1453,7 @@ func (x *GrpcUnsubscribeFromKafkaRequest) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcUnsubscribeFromKafkaRequest.ProtoReflect.Descriptor instead.
 func (*GrpcUnsubscribeFromKafkaRequest) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{23}
+	return file_kafka_service_proto_rawDescGZIP(), []int{24}
 }
 
 func (x *GrpcUnsubscribeFromKafkaRequest) GetSubscriptionId() *GrpcGuid {
@@ -1412,7 +1472,7 @@ type GrpcGetAllSubscriptionsAndPipelinesResponse struct {
 
 func (x *GrpcGetAllSubscriptionsAndPipelinesResponse) Reset() {
 	*x = GrpcGetAllSubscriptionsAndPipelinesResponse{}
-	mi := &file_kafka_service_proto_msgTypes[24]
+	mi := &file_kafka_service_proto_msgTypes[25]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1424,7 +1484,7 @@ func (x *GrpcGetAllSubscriptionsAndPipelinesResponse) String() string {
 func (*GrpcGetAllSubscriptionsAndPipelinesResponse) ProtoMessage() {}
 
 func (x *GrpcGetAllSubscriptionsAndPipelinesResponse) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[24]
+	mi := &file_kafka_service_proto_msgTypes[25]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1437,7 +1497,7 @@ func (x *GrpcGetAllSubscriptionsAndPipelinesResponse) ProtoReflect() protoreflec
 
 // Deprecated: Use GrpcGetAllSubscriptionsAndPipelinesResponse.ProtoReflect.Descriptor instead.
 func (*GrpcGetAllSubscriptionsAndPipelinesResponse) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{24}
+	return file_kafka_service_proto_rawDescGZIP(), []int{25}
 }
 
 func (x *GrpcGetAllSubscriptionsAndPipelinesResponse) GetSubscriptions() []*GrpcKafkaSubscription {
@@ -1458,7 +1518,7 @@ type GrpcKafkaSubscription struct {
 
 func (x *GrpcKafkaSubscription) Reset() {
 	*x = GrpcKafkaSubscription{}
-	mi := &file_kafka_service_proto_msgTypes[25]
+	mi := &file_kafka_service_proto_msgTypes[26]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1470,7 +1530,7 @@ func (x *GrpcKafkaSubscription) String() string {
 func (*GrpcKafkaSubscription) ProtoMessage() {}
 
 func (x *GrpcKafkaSubscription) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[25]
+	mi := &file_kafka_service_proto_msgTypes[26]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1483,7 +1543,7 @@ func (x *GrpcKafkaSubscription) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcKafkaSubscription.ProtoReflect.Descriptor instead.
 func (*GrpcKafkaSubscription) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{25}
+	return file_kafka_service_proto_rawDescGZIP(), []int{26}
 }
 
 func (x *GrpcKafkaSubscription) GetId() *GrpcGuid {
@@ -1517,7 +1577,7 @@ type GrpcSubscriptionPipeline struct {
 
 func (x *GrpcSubscriptionPipeline) Reset() {
 	*x = GrpcSubscriptionPipeline{}
-	mi := &file_kafka_service_proto_msgTypes[26]
+	mi := &file_kafka_service_proto_msgTypes[27]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -1529,7 +1589,7 @@ func (x *GrpcSubscriptionPipeline) String() string {
 func (*GrpcSubscriptionPipeline) ProtoMessage() {}
 
 func (x *GrpcSubscriptionPipeline) ProtoReflect() protoreflect.Message {
-	mi := &file_kafka_service_proto_msgTypes[26]
+	mi := &file_kafka_service_proto_msgTypes[27]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -1542,7 +1602,7 @@ func (x *GrpcSubscriptionPipeline) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use GrpcSubscriptionPipeline.ProtoReflect.Descriptor instead.
 func (*GrpcSubscriptionPipeline) Descriptor() ([]byte, []int) {
-	return file_kafka_service_proto_rawDescGZIP(), []int{26}
+	return file_kafka_service_proto_rawDescGZIP(), []int{27}
 }
 
 func (x *GrpcSubscriptionPipeline) GetId() *GrpcGuid {
@@ -1564,7 +1624,13 @@ var File_kafka_service_proto protoreflect.FileDescriptor
 const file_kafka_service_proto_rawDesc = "" +
 	"\n" +
 	"\x13kafka_service.proto\x12\x05ficus\x1a\x1bpipelines_and_context.proto\x1a\n" +
-	"util.proto\x1a\x15backend_service.proto\x1a\x1bgoogle/protobuf/empty.proto\"\xbd\x03\n" +
+	"util.proto\x1a\x15backend_service.proto\x1a\x1bgoogle/protobuf/empty.proto\"\xaa\x01\n" +
+	"\"GrpcGetCurrentContextValuesRequest\x127\n" +
+	"\x0esubscriptionId\x18\x01 \x01(\v2\x0f.ficus.GrpcGuidR\x0esubscriptionId\x12/\n" +
+	"\n" +
+	"pipelineId\x18\x02 \x01(\v2\x0f.ficus.GrpcGuidR\n" +
+	"pipelineId\x12\x1a\n" +
+	"\bcaseName\x18\x03 \x01(\tR\bcaseName\"\xbd\x03\n" +
 	")GrpcExecutePipelineAndProduceKafkaRequest\x12R\n" +
 	"\x0fpipelineRequest\x18\x01 \x01(\v2(.ficus.GrpcProxyPipelineExecutionRequestR\x0fpipelineRequest\x12N\n" +
 	"\x10producerMetadata\x18\x02 \x01(\v2\".ficus.GrpcKafkaConnectionMetadataR\x10producerMetadata\x122\n" +
@@ -1656,10 +1722,11 @@ const file_kafka_service_proto_rawDesc = "" +
 	"\tpipelines\x18\x03 \x03(\v2\x1f.ficus.GrpcSubscriptionPipelineR\tpipelines\"t\n" +
 	"\x18GrpcSubscriptionPipeline\x12\x1f\n" +
 	"\x02id\x18\x01 \x01(\v2\x0f.ficus.GrpcGuidR\x02id\x127\n" +
-	"\bmetadata\x18\x02 \x01(\v2\x1b.ficus.GrpcPipelineMetadataR\bmetadata2\xb2\x06\n" +
+	"\bmetadata\x18\x02 \x01(\v2\x1b.ficus.GrpcPipelineMetadataR\bmetadata2\xa2\a\n" +
 	"\x10GrpcKafkaService\x12T\n" +
 	"\x16SubscribeForKafkaTopic\x12\".ficus.GrpcSubscribeToKafkaRequest\x1a\x16.ficus.GrpcKafkaResult\x12[\n" +
-	"\x19UnsubscribeFromKafkaTopic\x12&.ficus.GrpcUnsubscribeFromKafkaRequest\x1a\x16.ficus.GrpcKafkaResult\x12R\n" +
+	"\x19UnsubscribeFromKafkaTopic\x12&.ficus.GrpcUnsubscribeFromKafkaRequest\x1a\x16.ficus.GrpcKafkaResult\x12n\n" +
+	"\x17GetCurrentContextValues\x12).ficus.GrpcGetCurrentContextValuesRequest\x1a&.ficus.GrpcPipelinePartExecutionResult0\x01\x12R\n" +
 	"\x19AddPipelineToSubscription\x12\x1d.ficus.GrpcAddPipelineRequest\x1a\x16.ficus.GrpcKafkaResult\x12p\n" +
 	"\x1fAddPipelineToSubscriptionStream\x12#.ficus.GrpcAddPipelineStreamRequest\x1a&.ficus.GrpcPipelinePartExecutionResult0\x01\x12V\n" +
 	"\x1aRemovePipelineSubscription\x12 .ficus.GrpcRemovePipelineRequest\x1a\x16.ficus.GrpcKafkaResult\x12^\n" +
@@ -1679,101 +1746,106 @@ func file_kafka_service_proto_rawDescGZIP() []byte {
 	return file_kafka_service_proto_rawDescData
 }
 
-var file_kafka_service_proto_msgTypes = make([]protoimpl.MessageInfo, 27)
+var file_kafka_service_proto_msgTypes = make([]protoimpl.MessageInfo, 28)
 var file_kafka_service_proto_goTypes = []any{
-	(*GrpcExecutePipelineAndProduceKafkaRequest)(nil),   // 0: ficus.GrpcExecutePipelineAndProduceKafkaRequest
-	(*GrpcProcessInfo)(nil),                             // 1: ficus.GrpcProcessInfo
-	(*GrpcSubscribeToKafkaRequest)(nil),                 // 2: ficus.GrpcSubscribeToKafkaRequest
-	(*GrpcKafkaSubscriptionMetadata)(nil),               // 3: ficus.GrpcKafkaSubscriptionMetadata
-	(*GrpcKafkaPipelineExecutionRequest)(nil),           // 4: ficus.GrpcKafkaPipelineExecutionRequest
-	(*GrpcPipelineMetadata)(nil),                        // 5: ficus.GrpcPipelineMetadata
-	(*GrpcAddPipelineRequest)(nil),                      // 6: ficus.GrpcAddPipelineRequest
-	(*GrpcPipelineStreamingConfiguration)(nil),          // 7: ficus.GrpcPipelineStreamingConfiguration
-	(*GrpcT1StreamingConfiguration)(nil),                // 8: ficus.GrpcT1StreamingConfiguration
-	(*GrpcT1TracesQueueConfiguration)(nil),              // 9: ficus.GrpcT1TracesQueueConfiguration
-	(*GrpcT1EventsTimeBasedCaching)(nil),                // 10: ficus.GrpcT1EventsTimeBasedCaching
-	(*GrpcT1TraceTimeBasedCaching)(nil),                 // 11: ficus.GrpcT1TraceTimeBasedCaching
-	(*GrpcT2StreamingConfiguration)(nil),                // 12: ficus.GrpcT2StreamingConfiguration
-	(*GrpcT2LossyCountConfiguration)(nil),               // 13: ficus.GrpcT2LossyCountConfiguration
-	(*GrpcT2TimedSlidingWindowConfiguration)(nil),       // 14: ficus.GrpcT2TimedSlidingWindowConfiguration
-	(*GrpcAddPipelineStreamRequest)(nil),                // 15: ficus.GrpcAddPipelineStreamRequest
-	(*GrpcRemovePipelineRequest)(nil),                   // 16: ficus.GrpcRemovePipelineRequest
-	(*GrpcRemoveAllPipelinesRequest)(nil),               // 17: ficus.GrpcRemoveAllPipelinesRequest
-	(*GrpcKafkaConnectionMetadata)(nil),                 // 18: ficus.GrpcKafkaConnectionMetadata
-	(*GrpcKafkaMetadata)(nil),                           // 19: ficus.GrpcKafkaMetadata
-	(*GrpcKafkaResult)(nil),                             // 20: ficus.GrpcKafkaResult
-	(*GrpcKafkaSuccessResult)(nil),                      // 21: ficus.GrpcKafkaSuccessResult
-	(*GrpcKafkaFailedResult)(nil),                       // 22: ficus.GrpcKafkaFailedResult
-	(*GrpcUnsubscribeFromKafkaRequest)(nil),             // 23: ficus.GrpcUnsubscribeFromKafkaRequest
-	(*GrpcGetAllSubscriptionsAndPipelinesResponse)(nil), // 24: ficus.GrpcGetAllSubscriptionsAndPipelinesResponse
-	(*GrpcKafkaSubscription)(nil),                       // 25: ficus.GrpcKafkaSubscription
-	(*GrpcSubscriptionPipeline)(nil),                    // 26: ficus.GrpcSubscriptionPipeline
-	(*GrpcProxyPipelineExecutionRequest)(nil),           // 27: ficus.GrpcProxyPipelineExecutionRequest
+	(*GrpcGetCurrentContextValuesRequest)(nil),          // 0: ficus.GrpcGetCurrentContextValuesRequest
+	(*GrpcExecutePipelineAndProduceKafkaRequest)(nil),   // 1: ficus.GrpcExecutePipelineAndProduceKafkaRequest
+	(*GrpcProcessInfo)(nil),                             // 2: ficus.GrpcProcessInfo
+	(*GrpcSubscribeToKafkaRequest)(nil),                 // 3: ficus.GrpcSubscribeToKafkaRequest
+	(*GrpcKafkaSubscriptionMetadata)(nil),               // 4: ficus.GrpcKafkaSubscriptionMetadata
+	(*GrpcKafkaPipelineExecutionRequest)(nil),           // 5: ficus.GrpcKafkaPipelineExecutionRequest
+	(*GrpcPipelineMetadata)(nil),                        // 6: ficus.GrpcPipelineMetadata
+	(*GrpcAddPipelineRequest)(nil),                      // 7: ficus.GrpcAddPipelineRequest
+	(*GrpcPipelineStreamingConfiguration)(nil),          // 8: ficus.GrpcPipelineStreamingConfiguration
+	(*GrpcT1StreamingConfiguration)(nil),                // 9: ficus.GrpcT1StreamingConfiguration
+	(*GrpcT1TracesQueueConfiguration)(nil),              // 10: ficus.GrpcT1TracesQueueConfiguration
+	(*GrpcT1EventsTimeBasedCaching)(nil),                // 11: ficus.GrpcT1EventsTimeBasedCaching
+	(*GrpcT1TraceTimeBasedCaching)(nil),                 // 12: ficus.GrpcT1TraceTimeBasedCaching
+	(*GrpcT2StreamingConfiguration)(nil),                // 13: ficus.GrpcT2StreamingConfiguration
+	(*GrpcT2LossyCountConfiguration)(nil),               // 14: ficus.GrpcT2LossyCountConfiguration
+	(*GrpcT2TimedSlidingWindowConfiguration)(nil),       // 15: ficus.GrpcT2TimedSlidingWindowConfiguration
+	(*GrpcAddPipelineStreamRequest)(nil),                // 16: ficus.GrpcAddPipelineStreamRequest
+	(*GrpcRemovePipelineRequest)(nil),                   // 17: ficus.GrpcRemovePipelineRequest
+	(*GrpcRemoveAllPipelinesRequest)(nil),               // 18: ficus.GrpcRemoveAllPipelinesRequest
+	(*GrpcKafkaConnectionMetadata)(nil),                 // 19: ficus.GrpcKafkaConnectionMetadata
+	(*GrpcKafkaMetadata)(nil),                           // 20: ficus.GrpcKafkaMetadata
+	(*GrpcKafkaResult)(nil),                             // 21: ficus.GrpcKafkaResult
+	(*GrpcKafkaSuccessResult)(nil),                      // 22: ficus.GrpcKafkaSuccessResult
+	(*GrpcKafkaFailedResult)(nil),                       // 23: ficus.GrpcKafkaFailedResult
+	(*GrpcUnsubscribeFromKafkaRequest)(nil),             // 24: ficus.GrpcUnsubscribeFromKafkaRequest
+	(*GrpcGetAllSubscriptionsAndPipelinesResponse)(nil), // 25: ficus.GrpcGetAllSubscriptionsAndPipelinesResponse
+	(*GrpcKafkaSubscription)(nil),                       // 26: ficus.GrpcKafkaSubscription
+	(*GrpcSubscriptionPipeline)(nil),                    // 27: ficus.GrpcSubscriptionPipeline
 	(*GrpcGuid)(nil),                                    // 28: ficus.GrpcGuid
-	(*GrpcPipelineExecutionRequest)(nil),                // 29: ficus.GrpcPipelineExecutionRequest
-	(*emptypb.Empty)(nil),                               // 30: google.protobuf.Empty
-	(*GrpcPipeline)(nil),                                // 31: ficus.GrpcPipeline
-	(*GrpcPipelinePartExecutionResult)(nil),             // 32: ficus.GrpcPipelinePartExecutionResult
+	(*GrpcProxyPipelineExecutionRequest)(nil),           // 29: ficus.GrpcProxyPipelineExecutionRequest
+	(*GrpcPipelineExecutionRequest)(nil),                // 30: ficus.GrpcPipelineExecutionRequest
+	(*emptypb.Empty)(nil),                               // 31: google.protobuf.Empty
+	(*GrpcPipeline)(nil),                                // 32: ficus.GrpcPipeline
+	(*GrpcPipelinePartExecutionResult)(nil),             // 33: ficus.GrpcPipelinePartExecutionResult
 }
 var file_kafka_service_proto_depIdxs = []int32{
-	27, // 0: ficus.GrpcExecutePipelineAndProduceKafkaRequest.pipelineRequest:type_name -> ficus.GrpcProxyPipelineExecutionRequest
-	18, // 1: ficus.GrpcExecutePipelineAndProduceKafkaRequest.producerMetadata:type_name -> ficus.GrpcKafkaConnectionMetadata
-	1,  // 2: ficus.GrpcExecutePipelineAndProduceKafkaRequest.caseInfo:type_name -> ficus.GrpcProcessInfo
-	28, // 3: ficus.GrpcExecutePipelineAndProduceKafkaRequest.subscriptionId:type_name -> ficus.GrpcGuid
-	28, // 4: ficus.GrpcExecutePipelineAndProduceKafkaRequest.pipelineId:type_name -> ficus.GrpcGuid
-	18, // 5: ficus.GrpcSubscribeToKafkaRequest.connectionMetadata:type_name -> ficus.GrpcKafkaConnectionMetadata
-	3,  // 6: ficus.GrpcSubscribeToKafkaRequest.subscriptionMetadata:type_name -> ficus.GrpcKafkaSubscriptionMetadata
-	28, // 7: ficus.GrpcKafkaPipelineExecutionRequest.subscriptionId:type_name -> ficus.GrpcGuid
-	29, // 8: ficus.GrpcKafkaPipelineExecutionRequest.pipelineRequest:type_name -> ficus.GrpcPipelineExecutionRequest
-	5,  // 9: ficus.GrpcKafkaPipelineExecutionRequest.pipelineMetadata:type_name -> ficus.GrpcPipelineMetadata
-	7,  // 10: ficus.GrpcKafkaPipelineExecutionRequest.streamingConfiguration:type_name -> ficus.GrpcPipelineStreamingConfiguration
-	4,  // 11: ficus.GrpcAddPipelineRequest.pipelineRequest:type_name -> ficus.GrpcKafkaPipelineExecutionRequest
-	18, // 12: ficus.GrpcAddPipelineRequest.producerKafkaMetadata:type_name -> ficus.GrpcKafkaConnectionMetadata
-	30, // 13: ficus.GrpcPipelineStreamingConfiguration.notSpecified:type_name -> google.protobuf.Empty
-	8,  // 14: ficus.GrpcPipelineStreamingConfiguration.t1Configuration:type_name -> ficus.GrpcT1StreamingConfiguration
-	12, // 15: ficus.GrpcPipelineStreamingConfiguration.t2Configuration:type_name -> ficus.GrpcT2StreamingConfiguration
-	10, // 16: ficus.GrpcT1StreamingConfiguration.eventsTimeout:type_name -> ficus.GrpcT1EventsTimeBasedCaching
-	11, // 17: ficus.GrpcT1StreamingConfiguration.tracesTimeout:type_name -> ficus.GrpcT1TraceTimeBasedCaching
-	9,  // 18: ficus.GrpcT1StreamingConfiguration.tracesQueueConfiguration:type_name -> ficus.GrpcT1TracesQueueConfiguration
-	13, // 19: ficus.GrpcT2StreamingConfiguration.lossyCount:type_name -> ficus.GrpcT2LossyCountConfiguration
-	14, // 20: ficus.GrpcT2StreamingConfiguration.timedSlidingWindow:type_name -> ficus.GrpcT2TimedSlidingWindowConfiguration
-	31, // 21: ficus.GrpcT2StreamingConfiguration.incomingTracesFilteringPipeline:type_name -> ficus.GrpcPipeline
-	4,  // 22: ficus.GrpcAddPipelineStreamRequest.pipelineRequest:type_name -> ficus.GrpcKafkaPipelineExecutionRequest
-	28, // 23: ficus.GrpcRemovePipelineRequest.subscriptionId:type_name -> ficus.GrpcGuid
-	28, // 24: ficus.GrpcRemovePipelineRequest.pipelineId:type_name -> ficus.GrpcGuid
-	28, // 25: ficus.GrpcRemoveAllPipelinesRequest.subscriptionId:type_name -> ficus.GrpcGuid
-	19, // 26: ficus.GrpcKafkaConnectionMetadata.metadata:type_name -> ficus.GrpcKafkaMetadata
-	21, // 27: ficus.GrpcKafkaResult.success:type_name -> ficus.GrpcKafkaSuccessResult
-	22, // 28: ficus.GrpcKafkaResult.failure:type_name -> ficus.GrpcKafkaFailedResult
-	28, // 29: ficus.GrpcKafkaSuccessResult.id:type_name -> ficus.GrpcGuid
-	28, // 30: ficus.GrpcUnsubscribeFromKafkaRequest.subscriptionId:type_name -> ficus.GrpcGuid
-	25, // 31: ficus.GrpcGetAllSubscriptionsAndPipelinesResponse.subscriptions:type_name -> ficus.GrpcKafkaSubscription
-	28, // 32: ficus.GrpcKafkaSubscription.id:type_name -> ficus.GrpcGuid
-	3,  // 33: ficus.GrpcKafkaSubscription.metadata:type_name -> ficus.GrpcKafkaSubscriptionMetadata
-	26, // 34: ficus.GrpcKafkaSubscription.pipelines:type_name -> ficus.GrpcSubscriptionPipeline
-	28, // 35: ficus.GrpcSubscriptionPipeline.id:type_name -> ficus.GrpcGuid
-	5,  // 36: ficus.GrpcSubscriptionPipeline.metadata:type_name -> ficus.GrpcPipelineMetadata
-	2,  // 37: ficus.GrpcKafkaService.SubscribeForKafkaTopic:input_type -> ficus.GrpcSubscribeToKafkaRequest
-	23, // 38: ficus.GrpcKafkaService.UnsubscribeFromKafkaTopic:input_type -> ficus.GrpcUnsubscribeFromKafkaRequest
-	6,  // 39: ficus.GrpcKafkaService.AddPipelineToSubscription:input_type -> ficus.GrpcAddPipelineRequest
-	15, // 40: ficus.GrpcKafkaService.AddPipelineToSubscriptionStream:input_type -> ficus.GrpcAddPipelineStreamRequest
-	16, // 41: ficus.GrpcKafkaService.RemovePipelineSubscription:input_type -> ficus.GrpcRemovePipelineRequest
-	17, // 42: ficus.GrpcKafkaService.RemoveAllPipelineSubscriptions:input_type -> ficus.GrpcRemoveAllPipelinesRequest
-	30, // 43: ficus.GrpcKafkaService.GetAllSubscriptionsAndPipelines:input_type -> google.protobuf.Empty
-	0,  // 44: ficus.GrpcKafkaService.ExecutePipelineAndProduceToKafka:input_type -> ficus.GrpcExecutePipelineAndProduceKafkaRequest
-	20, // 45: ficus.GrpcKafkaService.SubscribeForKafkaTopic:output_type -> ficus.GrpcKafkaResult
-	20, // 46: ficus.GrpcKafkaService.UnsubscribeFromKafkaTopic:output_type -> ficus.GrpcKafkaResult
-	20, // 47: ficus.GrpcKafkaService.AddPipelineToSubscription:output_type -> ficus.GrpcKafkaResult
-	32, // 48: ficus.GrpcKafkaService.AddPipelineToSubscriptionStream:output_type -> ficus.GrpcPipelinePartExecutionResult
-	20, // 49: ficus.GrpcKafkaService.RemovePipelineSubscription:output_type -> ficus.GrpcKafkaResult
-	20, // 50: ficus.GrpcKafkaService.RemoveAllPipelineSubscriptions:output_type -> ficus.GrpcKafkaResult
-	24, // 51: ficus.GrpcKafkaService.GetAllSubscriptionsAndPipelines:output_type -> ficus.GrpcGetAllSubscriptionsAndPipelinesResponse
-	32, // 52: ficus.GrpcKafkaService.ExecutePipelineAndProduceToKafka:output_type -> ficus.GrpcPipelinePartExecutionResult
-	45, // [45:53] is the sub-list for method output_type
-	37, // [37:45] is the sub-list for method input_type
-	37, // [37:37] is the sub-list for extension type_name
-	37, // [37:37] is the sub-list for extension extendee
-	0,  // [0:37] is the sub-list for field type_name
+	28, // 0: ficus.GrpcGetCurrentContextValuesRequest.subscriptionId:type_name -> ficus.GrpcGuid
+	28, // 1: ficus.GrpcGetCurrentContextValuesRequest.pipelineId:type_name -> ficus.GrpcGuid
+	29, // 2: ficus.GrpcExecutePipelineAndProduceKafkaRequest.pipelineRequest:type_name -> ficus.GrpcProxyPipelineExecutionRequest
+	19, // 3: ficus.GrpcExecutePipelineAndProduceKafkaRequest.producerMetadata:type_name -> ficus.GrpcKafkaConnectionMetadata
+	2,  // 4: ficus.GrpcExecutePipelineAndProduceKafkaRequest.caseInfo:type_name -> ficus.GrpcProcessInfo
+	28, // 5: ficus.GrpcExecutePipelineAndProduceKafkaRequest.subscriptionId:type_name -> ficus.GrpcGuid
+	28, // 6: ficus.GrpcExecutePipelineAndProduceKafkaRequest.pipelineId:type_name -> ficus.GrpcGuid
+	19, // 7: ficus.GrpcSubscribeToKafkaRequest.connectionMetadata:type_name -> ficus.GrpcKafkaConnectionMetadata
+	4,  // 8: ficus.GrpcSubscribeToKafkaRequest.subscriptionMetadata:type_name -> ficus.GrpcKafkaSubscriptionMetadata
+	28, // 9: ficus.GrpcKafkaPipelineExecutionRequest.subscriptionId:type_name -> ficus.GrpcGuid
+	30, // 10: ficus.GrpcKafkaPipelineExecutionRequest.pipelineRequest:type_name -> ficus.GrpcPipelineExecutionRequest
+	6,  // 11: ficus.GrpcKafkaPipelineExecutionRequest.pipelineMetadata:type_name -> ficus.GrpcPipelineMetadata
+	8,  // 12: ficus.GrpcKafkaPipelineExecutionRequest.streamingConfiguration:type_name -> ficus.GrpcPipelineStreamingConfiguration
+	5,  // 13: ficus.GrpcAddPipelineRequest.pipelineRequest:type_name -> ficus.GrpcKafkaPipelineExecutionRequest
+	19, // 14: ficus.GrpcAddPipelineRequest.producerKafkaMetadata:type_name -> ficus.GrpcKafkaConnectionMetadata
+	31, // 15: ficus.GrpcPipelineStreamingConfiguration.notSpecified:type_name -> google.protobuf.Empty
+	9,  // 16: ficus.GrpcPipelineStreamingConfiguration.t1Configuration:type_name -> ficus.GrpcT1StreamingConfiguration
+	13, // 17: ficus.GrpcPipelineStreamingConfiguration.t2Configuration:type_name -> ficus.GrpcT2StreamingConfiguration
+	11, // 18: ficus.GrpcT1StreamingConfiguration.eventsTimeout:type_name -> ficus.GrpcT1EventsTimeBasedCaching
+	12, // 19: ficus.GrpcT1StreamingConfiguration.tracesTimeout:type_name -> ficus.GrpcT1TraceTimeBasedCaching
+	10, // 20: ficus.GrpcT1StreamingConfiguration.tracesQueueConfiguration:type_name -> ficus.GrpcT1TracesQueueConfiguration
+	14, // 21: ficus.GrpcT2StreamingConfiguration.lossyCount:type_name -> ficus.GrpcT2LossyCountConfiguration
+	15, // 22: ficus.GrpcT2StreamingConfiguration.timedSlidingWindow:type_name -> ficus.GrpcT2TimedSlidingWindowConfiguration
+	32, // 23: ficus.GrpcT2StreamingConfiguration.incomingTracesFilteringPipeline:type_name -> ficus.GrpcPipeline
+	5,  // 24: ficus.GrpcAddPipelineStreamRequest.pipelineRequest:type_name -> ficus.GrpcKafkaPipelineExecutionRequest
+	28, // 25: ficus.GrpcRemovePipelineRequest.subscriptionId:type_name -> ficus.GrpcGuid
+	28, // 26: ficus.GrpcRemovePipelineRequest.pipelineId:type_name -> ficus.GrpcGuid
+	28, // 27: ficus.GrpcRemoveAllPipelinesRequest.subscriptionId:type_name -> ficus.GrpcGuid
+	20, // 28: ficus.GrpcKafkaConnectionMetadata.metadata:type_name -> ficus.GrpcKafkaMetadata
+	22, // 29: ficus.GrpcKafkaResult.success:type_name -> ficus.GrpcKafkaSuccessResult
+	23, // 30: ficus.GrpcKafkaResult.failure:type_name -> ficus.GrpcKafkaFailedResult
+	28, // 31: ficus.GrpcKafkaSuccessResult.id:type_name -> ficus.GrpcGuid
+	28, // 32: ficus.GrpcUnsubscribeFromKafkaRequest.subscriptionId:type_name -> ficus.GrpcGuid
+	26, // 33: ficus.GrpcGetAllSubscriptionsAndPipelinesResponse.subscriptions:type_name -> ficus.GrpcKafkaSubscription
+	28, // 34: ficus.GrpcKafkaSubscription.id:type_name -> ficus.GrpcGuid
+	4,  // 35: ficus.GrpcKafkaSubscription.metadata:type_name -> ficus.GrpcKafkaSubscriptionMetadata
+	27, // 36: ficus.GrpcKafkaSubscription.pipelines:type_name -> ficus.GrpcSubscriptionPipeline
+	28, // 37: ficus.GrpcSubscriptionPipeline.id:type_name -> ficus.GrpcGuid
+	6,  // 38: ficus.GrpcSubscriptionPipeline.metadata:type_name -> ficus.GrpcPipelineMetadata
+	3,  // 39: ficus.GrpcKafkaService.SubscribeForKafkaTopic:input_type -> ficus.GrpcSubscribeToKafkaRequest
+	24, // 40: ficus.GrpcKafkaService.UnsubscribeFromKafkaTopic:input_type -> ficus.GrpcUnsubscribeFromKafkaRequest
+	0,  // 41: ficus.GrpcKafkaService.GetCurrentContextValues:input_type -> ficus.GrpcGetCurrentContextValuesRequest
+	7,  // 42: ficus.GrpcKafkaService.AddPipelineToSubscription:input_type -> ficus.GrpcAddPipelineRequest
+	16, // 43: ficus.GrpcKafkaService.AddPipelineToSubscriptionStream:input_type -> ficus.GrpcAddPipelineStreamRequest
+	17, // 44: ficus.GrpcKafkaService.RemovePipelineSubscription:input_type -> ficus.GrpcRemovePipelineRequest
+	18, // 45: ficus.GrpcKafkaService.RemoveAllPipelineSubscriptions:input_type -> ficus.GrpcRemoveAllPipelinesRequest
+	31, // 46: ficus.GrpcKafkaService.GetAllSubscriptionsAndPipelines:input_type -> google.protobuf.Empty
+	1,  // 47: ficus.GrpcKafkaService.ExecutePipelineAndProduceToKafka:input_type -> ficus.GrpcExecutePipelineAndProduceKafkaRequest
+	21, // 48: ficus.GrpcKafkaService.SubscribeForKafkaTopic:output_type -> ficus.GrpcKafkaResult
+	21, // 49: ficus.GrpcKafkaService.UnsubscribeFromKafkaTopic:output_type -> ficus.GrpcKafkaResult
+	33, // 50: ficus.GrpcKafkaService.GetCurrentContextValues:output_type -> ficus.GrpcPipelinePartExecutionResult
+	21, // 51: ficus.GrpcKafkaService.AddPipelineToSubscription:output_type -> ficus.GrpcKafkaResult
+	33, // 52: ficus.GrpcKafkaService.AddPipelineToSubscriptionStream:output_type -> ficus.GrpcPipelinePartExecutionResult
+	21, // 53: ficus.GrpcKafkaService.RemovePipelineSubscription:output_type -> ficus.GrpcKafkaResult
+	21, // 54: ficus.GrpcKafkaService.RemoveAllPipelineSubscriptions:output_type -> ficus.GrpcKafkaResult
+	25, // 55: ficus.GrpcKafkaService.GetAllSubscriptionsAndPipelines:output_type -> ficus.GrpcGetAllSubscriptionsAndPipelinesResponse
+	33, // 56: ficus.GrpcKafkaService.ExecutePipelineAndProduceToKafka:output_type -> ficus.GrpcPipelinePartExecutionResult
+	48, // [48:57] is the sub-list for method output_type
+	39, // [39:48] is the sub-list for method input_type
+	39, // [39:39] is the sub-list for extension type_name
+	39, // [39:39] is the sub-list for extension extendee
+	0,  // [0:39] is the sub-list for field type_name
 }
 
 func init() { file_kafka_service_proto_init() }
@@ -1784,21 +1856,21 @@ func file_kafka_service_proto_init() {
 	file_pipelines_and_context_proto_init()
 	file_util_proto_init()
 	file_backend_service_proto_init()
-	file_kafka_service_proto_msgTypes[7].OneofWrappers = []any{
+	file_kafka_service_proto_msgTypes[8].OneofWrappers = []any{
 		(*GrpcPipelineStreamingConfiguration_NotSpecified)(nil),
 		(*GrpcPipelineStreamingConfiguration_T1Configuration)(nil),
 		(*GrpcPipelineStreamingConfiguration_T2Configuration)(nil),
 	}
-	file_kafka_service_proto_msgTypes[8].OneofWrappers = []any{
+	file_kafka_service_proto_msgTypes[9].OneofWrappers = []any{
 		(*GrpcT1StreamingConfiguration_EventsTimeout)(nil),
 		(*GrpcT1StreamingConfiguration_TracesTimeout)(nil),
 		(*GrpcT1StreamingConfiguration_TracesQueueConfiguration)(nil),
 	}
-	file_kafka_service_proto_msgTypes[12].OneofWrappers = []any{
+	file_kafka_service_proto_msgTypes[13].OneofWrappers = []any{
 		(*GrpcT2StreamingConfiguration_LossyCount)(nil),
 		(*GrpcT2StreamingConfiguration_TimedSlidingWindow)(nil),
 	}
-	file_kafka_service_proto_msgTypes[20].OneofWrappers = []any{
+	file_kafka_service_proto_msgTypes[21].OneofWrappers = []any{
 		(*GrpcKafkaResult_Success)(nil),
 		(*GrpcKafkaResult_Failure)(nil),
 	}
@@ -1808,7 +1880,7 @@ func file_kafka_service_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: unsafe.Slice(unsafe.StringData(file_kafka_service_proto_rawDesc), len(file_kafka_service_proto_rawDesc)),
 			NumEnums:      0,
-			NumMessages:   27,
+			NumMessages:   28,
 			NumExtensions: 0,
 			NumServices:   1,
 		},
diff --git a/Ficus/src/go/grpcmodels/kafka_service_grpc.pb.go b/Ficus/src/go/grpcmodels/kafka_service_grpc.pb.go
index 38c859967..c11e66d64 100644
--- a/Ficus/src/go/grpcmodels/kafka_service_grpc.pb.go
+++ b/Ficus/src/go/grpcmodels/kafka_service_grpc.pb.go
@@ -22,6 +22,7 @@ const _ = grpc.SupportPackageIsVersion9
 const (
 	GrpcKafkaService_SubscribeForKafkaTopic_FullMethodName           = "/ficus.GrpcKafkaService/SubscribeForKafkaTopic"
 	GrpcKafkaService_UnsubscribeFromKafkaTopic_FullMethodName        = "/ficus.GrpcKafkaService/UnsubscribeFromKafkaTopic"
+	GrpcKafkaService_GetCurrentContextValues_FullMethodName          = "/ficus.GrpcKafkaService/GetCurrentContextValues"
 	GrpcKafkaService_AddPipelineToSubscription_FullMethodName        = "/ficus.GrpcKafkaService/AddPipelineToSubscription"
 	GrpcKafkaService_AddPipelineToSubscriptionStream_FullMethodName  = "/ficus.GrpcKafkaService/AddPipelineToSubscriptionStream"
 	GrpcKafkaService_RemovePipelineSubscription_FullMethodName       = "/ficus.GrpcKafkaService/RemovePipelineSubscription"
@@ -36,6 +37,7 @@ const (
 type GrpcKafkaServiceClient interface {
 	SubscribeForKafkaTopic(ctx context.Context, in *GrpcSubscribeToKafkaRequest, opts ...grpc.CallOption) (*GrpcKafkaResult, error)
 	UnsubscribeFromKafkaTopic(ctx context.Context, in *GrpcUnsubscribeFromKafkaRequest, opts ...grpc.CallOption) (*GrpcKafkaResult, error)
+	GetCurrentContextValues(ctx context.Context, in *GrpcGetCurrentContextValuesRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[GrpcPipelinePartExecutionResult], error)
 	AddPipelineToSubscription(ctx context.Context, in *GrpcAddPipelineRequest, opts ...grpc.CallOption) (*GrpcKafkaResult, error)
 	AddPipelineToSubscriptionStream(ctx context.Context, in *GrpcAddPipelineStreamRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[GrpcPipelinePartExecutionResult], error)
 	RemovePipelineSubscription(ctx context.Context, in *GrpcRemovePipelineRequest, opts ...grpc.CallOption) (*GrpcKafkaResult, error)
@@ -72,6 +74,25 @@ func (c *grpcKafkaServiceClient) UnsubscribeFromKafkaTopic(ctx context.Context,
 	return out, nil
 }
 
+func (c *grpcKafkaServiceClient) GetCurrentContextValues(ctx context.Context, in *GrpcGetCurrentContextValuesRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[GrpcPipelinePartExecutionResult], error) {
+	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
+	stream, err := c.cc.NewStream(ctx, &GrpcKafkaService_ServiceDesc.Streams[0], GrpcKafkaService_GetCurrentContextValues_FullMethodName, cOpts...)
+	if err != nil {
+		return nil, err
+	}
+	x := &grpc.GenericClientStream[GrpcGetCurrentContextValuesRequest, GrpcPipelinePartExecutionResult]{ClientStream: stream}
+	if err := x.ClientStream.SendMsg(in); err != nil {
+		return nil, err
+	}
+	if err := x.ClientStream.CloseSend(); err != nil {
+		return nil, err
+	}
+	return x, nil
+}
+
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type GrpcKafkaService_GetCurrentContextValuesClient = grpc.ServerStreamingClient[GrpcPipelinePartExecutionResult]
+
 func (c *grpcKafkaServiceClient) AddPipelineToSubscription(ctx context.Context, in *GrpcAddPipelineRequest, opts ...grpc.CallOption) (*GrpcKafkaResult, error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
 	out := new(GrpcKafkaResult)
@@ -84,7 +105,7 @@ func (c *grpcKafkaServiceClient) AddPipelineToSubscription(ctx context.Context,
 
 func (c *grpcKafkaServiceClient) AddPipelineToSubscriptionStream(ctx context.Context, in *GrpcAddPipelineStreamRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[GrpcPipelinePartExecutionResult], error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	stream, err := c.cc.NewStream(ctx, &GrpcKafkaService_ServiceDesc.Streams[0], GrpcKafkaService_AddPipelineToSubscriptionStream_FullMethodName, cOpts...)
+	stream, err := c.cc.NewStream(ctx, &GrpcKafkaService_ServiceDesc.Streams[1], GrpcKafkaService_AddPipelineToSubscriptionStream_FullMethodName, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -133,7 +154,7 @@ func (c *grpcKafkaServiceClient) GetAllSubscriptionsAndPipelines(ctx context.Con
 
 func (c *grpcKafkaServiceClient) ExecutePipelineAndProduceToKafka(ctx context.Context, in *GrpcExecutePipelineAndProduceKafkaRequest, opts ...grpc.CallOption) (grpc.ServerStreamingClient[GrpcPipelinePartExecutionResult], error) {
 	cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
-	stream, err := c.cc.NewStream(ctx, &GrpcKafkaService_ServiceDesc.Streams[1], GrpcKafkaService_ExecutePipelineAndProduceToKafka_FullMethodName, cOpts...)
+	stream, err := c.cc.NewStream(ctx, &GrpcKafkaService_ServiceDesc.Streams[2], GrpcKafkaService_ExecutePipelineAndProduceToKafka_FullMethodName, cOpts...)
 	if err != nil {
 		return nil, err
 	}
@@ -156,6 +177,7 @@ type GrpcKafkaService_ExecutePipelineAndProduceToKafkaClient = grpc.ServerStream
 type GrpcKafkaServiceServer interface {
 	SubscribeForKafkaTopic(context.Context, *GrpcSubscribeToKafkaRequest) (*GrpcKafkaResult, error)
 	UnsubscribeFromKafkaTopic(context.Context, *GrpcUnsubscribeFromKafkaRequest) (*GrpcKafkaResult, error)
+	GetCurrentContextValues(*GrpcGetCurrentContextValuesRequest, grpc.ServerStreamingServer[GrpcPipelinePartExecutionResult]) error
 	AddPipelineToSubscription(context.Context, *GrpcAddPipelineRequest) (*GrpcKafkaResult, error)
 	AddPipelineToSubscriptionStream(*GrpcAddPipelineStreamRequest, grpc.ServerStreamingServer[GrpcPipelinePartExecutionResult]) error
 	RemovePipelineSubscription(context.Context, *GrpcRemovePipelineRequest) (*GrpcKafkaResult, error)
@@ -178,6 +200,9 @@ func (UnimplementedGrpcKafkaServiceServer) SubscribeForKafkaTopic(context.Contex
 func (UnimplementedGrpcKafkaServiceServer) UnsubscribeFromKafkaTopic(context.Context, *GrpcUnsubscribeFromKafkaRequest) (*GrpcKafkaResult, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method UnsubscribeFromKafkaTopic not implemented")
 }
+func (UnimplementedGrpcKafkaServiceServer) GetCurrentContextValues(*GrpcGetCurrentContextValuesRequest, grpc.ServerStreamingServer[GrpcPipelinePartExecutionResult]) error {
+	return status.Errorf(codes.Unimplemented, "method GetCurrentContextValues not implemented")
+}
 func (UnimplementedGrpcKafkaServiceServer) AddPipelineToSubscription(context.Context, *GrpcAddPipelineRequest) (*GrpcKafkaResult, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method AddPipelineToSubscription not implemented")
 }
@@ -253,6 +278,17 @@ func _GrpcKafkaService_UnsubscribeFromKafkaTopic_Handler(srv interface{}, ctx co
 	return interceptor(ctx, in, info, handler)
 }
 
+func _GrpcKafkaService_GetCurrentContextValues_Handler(srv interface{}, stream grpc.ServerStream) error {
+	m := new(GrpcGetCurrentContextValuesRequest)
+	if err := stream.RecvMsg(m); err != nil {
+		return err
+	}
+	return srv.(GrpcKafkaServiceServer).GetCurrentContextValues(m, &grpc.GenericServerStream[GrpcGetCurrentContextValuesRequest, GrpcPipelinePartExecutionResult]{ServerStream: stream})
+}
+
+// This type alias is provided for backwards compatibility with existing code that references the prior non-generic stream type by name.
+type GrpcKafkaService_GetCurrentContextValuesServer = grpc.ServerStreamingServer[GrpcPipelinePartExecutionResult]
+
 func _GrpcKafkaService_AddPipelineToSubscription_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
 	in := new(GrpcAddPipelineRequest)
 	if err := dec(in); err != nil {
@@ -380,6 +416,11 @@ var GrpcKafkaService_ServiceDesc = grpc.ServiceDesc{
 		},
 	},
 	Streams: []grpc.StreamDesc{
+		{
+			StreamName:    "GetCurrentContextValues",
+			Handler:       _GrpcKafkaService_GetCurrentContextValues_Handler,
+			ServerStreams: true,
+		},
 		{
 			StreamName:    "AddPipelineToSubscriptionStream",
 			Handler:       _GrpcKafkaService_AddPipelineToSubscriptionStream_Handler,
diff --git a/Ficus/src/python/ficus/grpc_pipelines/models/backend_service_pb2.py b/Ficus/src/python/ficus/grpc_pipelines/models/backend_service_pb2.py
index 42be1abf0..fd84a0855 100644
--- a/Ficus/src/python/ficus/grpc_pipelines/models/backend_service_pb2.py
+++ b/Ficus/src/python/ficus/grpc_pipelines/models/backend_service_pb2.py
@@ -34,7 +34,7 @@
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x62\x61\x63kend_service.proto\x12\x05\x66icus\x1a\x1bpipelines_and_context.proto\x1a\nutil.proto\x1a\x1bgoogle/protobuf/empty.proto\"h\n(GrpcPredefinedPipelinePartsToBackendsMap\x12<\n\x11parts_to_backends\x18\x01 \x03(\x0b\x32!.ficus.GrpcPipelinePartToBackends\"A\n\x1aGrpcPipelinePartToBackends\x12\x11\n\tpart_name\x18\x01 \x01(\t\x12\x10\n\x08\x62\x61\x63kends\x18\x02 \x03(\t\"_\n\x14GrpcFicusBackendInfo\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x39\n\x0epipeline_parts\x18\x02 \x03(\x0b\x32!.ficus.GrpcPipelinePartDescriptor\"*\n\x1aGrpcPipelinePartDescriptor\x12\x0c\n\x04name\x18\x01 \x01(\t\"f\n\x1aGrpcGetContextValueRequest\x12$\n\x0b\x65xecutionId\x18\x02 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12\"\n\x03key\x18\x01 \x01(\x0b\x32\x15.ficus.GrpcContextKey\"y\n\x1cGrpcPipelineExecutionRequest\x12%\n\x08pipeline\x18\x01 \x01(\x0b\x32\x13.ficus.GrpcPipeline\x12\x32\n\x0einitialContext\x18\x02 \x03(\x0b\x32\x1a.ficus.GrpcContextKeyValue\"u\n!GrpcProxyPipelineExecutionRequest\x12%\n\x08pipeline\x18\x01 \x01(\x0b\x32\x13.ficus.GrpcPipeline\x12)\n\x10\x63ontextValuesIds\x18\x02 \x03(\x0b\x32\x0f.ficus.GrpcGuid\"\xd8\x01\n\x1fGrpcPipelinePartExecutionResult\x12\x35\n\x0b\x66inalResult\x18\x01 \x01(\x0b\x32\x1e.ficus.GrpcPipelineFinalResultH\x00\x12;\n\x12pipelinePartResult\x18\x02 \x01(\x0b\x32\x1d.ficus.GrpcPipelinePartResultH\x00\x12\x37\n\nlogMessage\x18\x03 \x01(\x0b\x32!.ficus.GrpcPipelinePartLogMessageH\x00\x42\x08\n\x06result\"-\n\x1aGrpcPipelinePartLogMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"r\n\x16GrpcPipelinePartResult\x12\x39\n\rcontextValues\x18\x01 \x03(\x0b\x32\".ficus.GrpcContextValueWithKeyName\x12\x1d\n\x04guid\x18\x02 \x01(\x0b\x32\x0f.ficus.GrpcGuid\"a\n\x17GrpcPipelineFinalResult\x12\"\n\x07success\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuidH\x00\x12\x0f\n\x05\x65rror\x18\x02 \x01(\tH\x00\x42\x11\n\x0f\x65xecutionResult\"H\n\x1dGrpcGetAllContextValuesResult\x12\'\n\x0e\x63ontext_values\x18\x01 \x03(\x0b\x32\x0f.ficus.GrpcGuid2\x86\x01\n\x1aGrpcBackendBalancerService\x12h\n\x1dSetPipelinePartsToBackendsMap\x12/.ficus.GrpcPredefinedPipelinePartsToBackendsMap\x1a\x16.google.protobuf.Empty2\x97\x03\n\x12GrpcBackendService\x12\x65\n\x0f\x45xecutePipeline\x12(.ficus.GrpcProxyPipelineExecutionRequest\x1a&.ficus.GrpcPipelinePartExecutionResult0\x01\x12\x45\n\x0fGetContextValue\x12!.ficus.GrpcGetContextValueRequest\x1a\x0f.ficus.GrpcGuid\x12L\n\x13GetAllContextValues\x12\x0f.ficus.GrpcGuid\x1a$.ficus.GrpcGetAllContextValuesResult\x12>\n\x13\x44ropExecutionResult\x12\x0f.ficus.GrpcGuid\x1a\x16.google.protobuf.Empty\x12\x45\n\x0eGetBackendInfo\x12\x16.google.protobuf.Empty\x1a\x1b.ficus.GrpcFicusBackendInfoB\x0fZ\r./;grpcmodelsb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x15\x62\x61\x63kend_service.proto\x12\x05\x66icus\x1a\x1bpipelines_and_context.proto\x1a\nutil.proto\x1a\x1bgoogle/protobuf/empty.proto\"h\n(GrpcPredefinedPipelinePartsToBackendsMap\x12<\n\x11parts_to_backends\x18\x01 \x03(\x0b\x32!.ficus.GrpcPipelinePartToBackends\"A\n\x1aGrpcPipelinePartToBackends\x12\x11\n\tpart_name\x18\x01 \x01(\t\x12\x10\n\x08\x62\x61\x63kends\x18\x02 \x03(\t\"_\n\x14GrpcFicusBackendInfo\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x39\n\x0epipeline_parts\x18\x02 \x03(\x0b\x32!.ficus.GrpcPipelinePartDescriptor\"*\n\x1aGrpcPipelinePartDescriptor\x12\x0c\n\x04name\x18\x01 \x01(\t\"y\n\x1cGrpcPipelineExecutionRequest\x12%\n\x08pipeline\x18\x01 \x01(\x0b\x32\x13.ficus.GrpcPipeline\x12\x32\n\x0einitialContext\x18\x02 \x03(\x0b\x32\x1a.ficus.GrpcContextKeyValue\"u\n!GrpcProxyPipelineExecutionRequest\x12%\n\x08pipeline\x18\x01 \x01(\x0b\x32\x13.ficus.GrpcPipeline\x12)\n\x10\x63ontextValuesIds\x18\x02 \x03(\x0b\x32\x0f.ficus.GrpcGuid\"\xd8\x01\n\x1fGrpcPipelinePartExecutionResult\x12\x35\n\x0b\x66inalResult\x18\x01 \x01(\x0b\x32\x1e.ficus.GrpcPipelineFinalResultH\x00\x12;\n\x12pipelinePartResult\x18\x02 \x01(\x0b\x32\x1d.ficus.GrpcPipelinePartResultH\x00\x12\x37\n\nlogMessage\x18\x03 \x01(\x0b\x32!.ficus.GrpcPipelinePartLogMessageH\x00\x42\x08\n\x06result\"-\n\x1aGrpcPipelinePartLogMessage\x12\x0f\n\x07message\x18\x01 \x01(\t\"\x9a\x01\n\x16GrpcPipelinePartResult\x12\x39\n\rcontextValues\x18\x01 \x03(\x0b\x32\".ficus.GrpcContextValueWithKeyName\x12)\n\x10pipeline_part_id\x18\x02 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12\x1a\n\x12pipeline_part_name\x18\x03 \x01(\t\"a\n\x17GrpcPipelineFinalResult\x12\"\n\x07success\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuidH\x00\x12\x0f\n\x05\x65rror\x18\x02 \x01(\tH\x00\x42\x11\n\x0f\x65xecutionResult2\x86\x01\n\x1aGrpcBackendBalancerService\x12h\n\x1dSetPipelinePartsToBackendsMap\x12/.ficus.GrpcPredefinedPipelinePartsToBackendsMap\x1a\x16.google.protobuf.Empty2\x82\x02\n\x12GrpcBackendService\x12\x65\n\x0f\x45xecutePipeline\x12(.ficus.GrpcProxyPipelineExecutionRequest\x1a&.ficus.GrpcPipelinePartExecutionResult0\x01\x12>\n\x13\x44ropExecutionResult\x12\x0f.ficus.GrpcGuid\x1a\x16.google.protobuf.Empty\x12\x45\n\x0eGetBackendInfo\x12\x16.google.protobuf.Empty\x1a\x1b.ficus.GrpcFicusBackendInfoB\x0fZ\r./;grpcmodelsb\x06proto3')
 
 
 
@@ -66,44 +66,36 @@
 
   _globals['_GRPCPIPELINEPARTDESCRIPTOR']._serialized_end=414
 
-  _globals['_GRPCGETCONTEXTVALUEREQUEST']._serialized_start=416
+  _globals['_GRPCPIPELINEEXECUTIONREQUEST']._serialized_start=416
 
-  _globals['_GRPCGETCONTEXTVALUEREQUEST']._serialized_end=518
+  _globals['_GRPCPIPELINEEXECUTIONREQUEST']._serialized_end=537
 
-  _globals['_GRPCPIPELINEEXECUTIONREQUEST']._serialized_start=520
+  _globals['_GRPCPROXYPIPELINEEXECUTIONREQUEST']._serialized_start=539
 
-  _globals['_GRPCPIPELINEEXECUTIONREQUEST']._serialized_end=641
+  _globals['_GRPCPROXYPIPELINEEXECUTIONREQUEST']._serialized_end=656
 
-  _globals['_GRPCPROXYPIPELINEEXECUTIONREQUEST']._serialized_start=643
+  _globals['_GRPCPIPELINEPARTEXECUTIONRESULT']._serialized_start=659
 
-  _globals['_GRPCPROXYPIPELINEEXECUTIONREQUEST']._serialized_end=760
+  _globals['_GRPCPIPELINEPARTEXECUTIONRESULT']._serialized_end=875
 
-  _globals['_GRPCPIPELINEPARTEXECUTIONRESULT']._serialized_start=763
+  _globals['_GRPCPIPELINEPARTLOGMESSAGE']._serialized_start=877
 
-  _globals['_GRPCPIPELINEPARTEXECUTIONRESULT']._serialized_end=979
+  _globals['_GRPCPIPELINEPARTLOGMESSAGE']._serialized_end=922
 
-  _globals['_GRPCPIPELINEPARTLOGMESSAGE']._serialized_start=981
+  _globals['_GRPCPIPELINEPARTRESULT']._serialized_start=925
 
-  _globals['_GRPCPIPELINEPARTLOGMESSAGE']._serialized_end=1026
+  _globals['_GRPCPIPELINEPARTRESULT']._serialized_end=1079
 
-  _globals['_GRPCPIPELINEPARTRESULT']._serialized_start=1028
+  _globals['_GRPCPIPELINEFINALRESULT']._serialized_start=1081
 
-  _globals['_GRPCPIPELINEPARTRESULT']._serialized_end=1142
+  _globals['_GRPCPIPELINEFINALRESULT']._serialized_end=1178
 
-  _globals['_GRPCPIPELINEFINALRESULT']._serialized_start=1144
+  _globals['_GRPCBACKENDBALANCERSERVICE']._serialized_start=1181
 
-  _globals['_GRPCPIPELINEFINALRESULT']._serialized_end=1241
+  _globals['_GRPCBACKENDBALANCERSERVICE']._serialized_end=1315
 
-  _globals['_GRPCGETALLCONTEXTVALUESRESULT']._serialized_start=1243
+  _globals['_GRPCBACKENDSERVICE']._serialized_start=1318
 
-  _globals['_GRPCGETALLCONTEXTVALUESRESULT']._serialized_end=1315
-
-  _globals['_GRPCBACKENDBALANCERSERVICE']._serialized_start=1318
-
-  _globals['_GRPCBACKENDBALANCERSERVICE']._serialized_end=1452
-
-  _globals['_GRPCBACKENDSERVICE']._serialized_start=1455
-
-  _globals['_GRPCBACKENDSERVICE']._serialized_end=1862
+  _globals['_GRPCBACKENDSERVICE']._serialized_end=1576
 
 # @@protoc_insertion_point(module_scope)
diff --git a/Ficus/src/python/ficus/grpc_pipelines/models/backend_service_pb2.pyi b/Ficus/src/python/ficus/grpc_pipelines/models/backend_service_pb2.pyi
index 86a560d5f..64af0393b 100644
--- a/Ficus/src/python/ficus/grpc_pipelines/models/backend_service_pb2.pyi
+++ b/Ficus/src/python/ficus/grpc_pipelines/models/backend_service_pb2.pyi
@@ -36,14 +36,6 @@ class GrpcPipelinePartDescriptor(_message.Message):
     name: str
     def __init__(self, name: _Optional[str] = ...) -> None: ...
 
-class GrpcGetContextValueRequest(_message.Message):
-    __slots__ = ["executionId", "key"]
-    EXECUTIONID_FIELD_NUMBER: _ClassVar[int]
-    KEY_FIELD_NUMBER: _ClassVar[int]
-    executionId: _util_pb2.GrpcGuid
-    key: _pipelines_and_context_pb2.GrpcContextKey
-    def __init__(self, executionId: _Optional[_Union[_util_pb2.GrpcGuid, _Mapping]] = ..., key: _Optional[_Union[_pipelines_and_context_pb2.GrpcContextKey, _Mapping]] = ...) -> None: ...
-
 class GrpcPipelineExecutionRequest(_message.Message):
     __slots__ = ["pipeline", "initialContext"]
     PIPELINE_FIELD_NUMBER: _ClassVar[int]
@@ -77,12 +69,14 @@ class GrpcPipelinePartLogMessage(_message.Message):
     def __init__(self, message: _Optional[str] = ...) -> None: ...
 
 class GrpcPipelinePartResult(_message.Message):
-    __slots__ = ["contextValues", "guid"]
+    __slots__ = ["contextValues", "pipeline_part_id", "pipeline_part_name"]
     CONTEXTVALUES_FIELD_NUMBER: _ClassVar[int]
-    GUID_FIELD_NUMBER: _ClassVar[int]
+    PIPELINE_PART_ID_FIELD_NUMBER: _ClassVar[int]
+    PIPELINE_PART_NAME_FIELD_NUMBER: _ClassVar[int]
     contextValues: _containers.RepeatedCompositeFieldContainer[_pipelines_and_context_pb2.GrpcContextValueWithKeyName]
-    guid: _util_pb2.GrpcGuid
-    def __init__(self, contextValues: _Optional[_Iterable[_Union[_pipelines_and_context_pb2.GrpcContextValueWithKeyName, _Mapping]]] = ..., guid: _Optional[_Union[_util_pb2.GrpcGuid, _Mapping]] = ...) -> None: ...
+    pipeline_part_id: _util_pb2.GrpcGuid
+    pipeline_part_name: str
+    def __init__(self, contextValues: _Optional[_Iterable[_Union[_pipelines_and_context_pb2.GrpcContextValueWithKeyName, _Mapping]]] = ..., pipeline_part_id: _Optional[_Union[_util_pb2.GrpcGuid, _Mapping]] = ..., pipeline_part_name: _Optional[str] = ...) -> None: ...
 
 class GrpcPipelineFinalResult(_message.Message):
     __slots__ = ["success", "error"]
@@ -91,9 +85,3 @@ class GrpcPipelineFinalResult(_message.Message):
     success: _util_pb2.GrpcGuid
     error: str
     def __init__(self, success: _Optional[_Union[_util_pb2.GrpcGuid, _Mapping]] = ..., error: _Optional[str] = ...) -> None: ...
-
-class GrpcGetAllContextValuesResult(_message.Message):
-    __slots__ = ["context_values"]
-    CONTEXT_VALUES_FIELD_NUMBER: _ClassVar[int]
-    context_values: _containers.RepeatedCompositeFieldContainer[_util_pb2.GrpcGuid]
-    def __init__(self, context_values: _Optional[_Iterable[_Union[_util_pb2.GrpcGuid, _Mapping]]] = ...) -> None: ...
diff --git a/Ficus/src/python/ficus/grpc_pipelines/models/backend_service_pb2_grpc.py b/Ficus/src/python/ficus/grpc_pipelines/models/backend_service_pb2_grpc.py
index 4986b62b3..8d5e7eb81 100644
--- a/Ficus/src/python/ficus/grpc_pipelines/models/backend_service_pb2_grpc.py
+++ b/Ficus/src/python/ficus/grpc_pipelines/models/backend_service_pb2_grpc.py
@@ -166,26 +166,6 @@ def __init__(self, channel):
 
                 )
 
-        self.GetContextValue = channel.unary_unary(
-
-                '/ficus.GrpcBackendService/GetContextValue',
-
-                request_serializer=backend__service__pb2.GrpcGetContextValueRequest.SerializeToString,
-
-                response_deserializer=util__pb2.GrpcGuid.FromString,
-
-                )
-
-        self.GetAllContextValues = channel.unary_unary(
-
-                '/ficus.GrpcBackendService/GetAllContextValues',
-
-                request_serializer=util__pb2.GrpcGuid.SerializeToString,
-
-                response_deserializer=backend__service__pb2.GrpcGetAllContextValuesResult.FromString,
-
-                )
-
         self.DropExecutionResult = channel.unary_unary(
 
                 '/ficus.GrpcBackendService/DropExecutionResult',
@@ -228,30 +208,6 @@ def ExecutePipeline(self, request, context):
 
 
 
-    def GetContextValue(self, request, context):
-
-        """Missing associated documentation comment in .proto file."""
-
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-
-        context.set_details('Method not implemented!')
-
-        raise NotImplementedError('Method not implemented!')
-
-
-
-    def GetAllContextValues(self, request, context):
-
-        """Missing associated documentation comment in .proto file."""
-
-        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
-
-        context.set_details('Method not implemented!')
-
-        raise NotImplementedError('Method not implemented!')
-
-
-
     def DropExecutionResult(self, request, context):
 
         """Missing associated documentation comment in .proto file."""
@@ -292,26 +248,6 @@ def add_GrpcBackendServiceServicer_to_server(servicer, server):
 
             ),
 
-            'GetContextValue': grpc.unary_unary_rpc_method_handler(
-
-                    servicer.GetContextValue,
-
-                    request_deserializer=backend__service__pb2.GrpcGetContextValueRequest.FromString,
-
-                    response_serializer=util__pb2.GrpcGuid.SerializeToString,
-
-            ),
-
-            'GetAllContextValues': grpc.unary_unary_rpc_method_handler(
-
-                    servicer.GetAllContextValues,
-
-                    request_deserializer=util__pb2.GrpcGuid.FromString,
-
-                    response_serializer=backend__service__pb2.GrpcGetAllContextValuesResult.SerializeToString,
-
-            ),
-
             'DropExecutionResult': grpc.unary_unary_rpc_method_handler(
 
                     servicer.DropExecutionResult,
@@ -386,74 +322,6 @@ def ExecutePipeline(request,
 
 
 
-    @staticmethod
-
-    def GetContextValue(request,
-
-            target,
-
-            options=(),
-
-            channel_credentials=None,
-
-            call_credentials=None,
-
-            insecure=False,
-
-            compression=None,
-
-            wait_for_ready=None,
-
-            timeout=None,
-
-            metadata=None):
-
-        return grpc.experimental.unary_unary(request, target, '/ficus.GrpcBackendService/GetContextValue',
-
-            backend__service__pb2.GrpcGetContextValueRequest.SerializeToString,
-
-            util__pb2.GrpcGuid.FromString,
-
-            options, channel_credentials,
-
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
-
-
-
-    @staticmethod
-
-    def GetAllContextValues(request,
-
-            target,
-
-            options=(),
-
-            channel_credentials=None,
-
-            call_credentials=None,
-
-            insecure=False,
-
-            compression=None,
-
-            wait_for_ready=None,
-
-            timeout=None,
-
-            metadata=None):
-
-        return grpc.experimental.unary_unary(request, target, '/ficus.GrpcBackendService/GetAllContextValues',
-
-            util__pb2.GrpcGuid.SerializeToString,
-
-            backend__service__pb2.GrpcGetAllContextValuesResult.FromString,
-
-            options, channel_credentials,
-
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
-
-
-
     @staticmethod
 
     def DropExecutionResult(request,
diff --git a/Ficus/src/python/ficus/grpc_pipelines/models/context_values_service_pb2.py b/Ficus/src/python/ficus/grpc_pipelines/models/context_values_service_pb2.py
index 05daac4ea..155e8754e 100644
--- a/Ficus/src/python/ficus/grpc_pipelines/models/context_values_service_pb2.py
+++ b/Ficus/src/python/ficus/grpc_pipelines/models/context_values_service_pb2.py
@@ -34,7 +34,7 @@
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x63ontext_values_service.proto\x12\x05\x66icus\x1a\x1bpipelines_and_context.proto\x1a\nutil.proto\x1a\x1bgoogle/protobuf/empty.proto\"2\n\x14GrpcContextValuePart\x12\x0b\n\x03key\x18\x02 \x01(\t\x12\r\n\x05\x62ytes\x18\x03 \x01(\x0c\"<\n\x1cGrpcDropContextValuesRequest\x12\x1c\n\x03ids\x18\x01 \x03(\x0b\x32\x0f.ficus.GrpcGuid2\xf2\x01\n\x18GrpcContextValuesService\x12\x41\n\x0fSetContextValue\x12\x1b.ficus.GrpcContextValuePart\x1a\x0f.ficus.GrpcGuid(\x01\x12\x41\n\x0fGetContextValue\x12\x0f.ficus.GrpcGuid\x1a\x1b.ficus.GrpcContextValuePart0\x01\x12P\n\x11\x44ropContextValues\x12#.ficus.GrpcDropContextValuesRequest\x1a\x16.google.protobuf.EmptyB\x0fZ\r./;grpcmodelsb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x1c\x63ontext_values_service.proto\x12\x05\x66icus\x1a\x1bpipelines_and_context.proto\x1a\nutil.proto\x1a\x1bgoogle/protobuf/empty.proto\"2\n\x14GrpcContextValuePart\x12\x0b\n\x03key\x18\x02 \x01(\t\x12\r\n\x05\x62ytes\x18\x03 \x01(\x0c\"<\n\x1cGrpcDropContextValuesRequest\x12\x1c\n\x03ids\x18\x01 \x03(\x0b\x32\x0f.ficus.GrpcGuid\"f\n\x1aGrpcGetContextValueRequest\x12$\n\x0b\x65xecutionId\x18\x02 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12\"\n\x03key\x18\x01 \x01(\x0b\x32\x15.ficus.GrpcContextKey\"H\n\x1dGrpcGetAllContextValuesResult\x12\'\n\x0e\x63ontext_values\x18\x01 \x03(\x0b\x32\x0f.ficus.GrpcGuid2\x8c\x03\n\x18GrpcContextValuesService\x12\x41\n\x0fSetContextValue\x12\x1b.ficus.GrpcContextValuePart\x1a\x0f.ficus.GrpcGuid(\x01\x12\x41\n\x0fGetContextValue\x12\x0f.ficus.GrpcGuid\x1a\x1b.ficus.GrpcContextValuePart0\x01\x12P\n\x11\x44ropContextValues\x12#.ficus.GrpcDropContextValuesRequest\x1a\x16.google.protobuf.Empty\x12G\n\x11GetContextValueId\x12!.ficus.GrpcGetContextValueRequest\x1a\x0f.ficus.GrpcGuid\x12O\n\x16GetAllContextValuesIds\x12\x0f.ficus.GrpcGuid\x1a$.ficus.GrpcGetAllContextValuesResultB\x0fZ\r./;grpcmodelsb\x06proto3')
 
 
 
@@ -58,8 +58,16 @@
 
   _globals['_GRPCDROPCONTEXTVALUESREQUEST']._serialized_end=221
 
-  _globals['_GRPCCONTEXTVALUESSERVICE']._serialized_start=224
+  _globals['_GRPCGETCONTEXTVALUEREQUEST']._serialized_start=223
 
-  _globals['_GRPCCONTEXTVALUESSERVICE']._serialized_end=466
+  _globals['_GRPCGETCONTEXTVALUEREQUEST']._serialized_end=325
+
+  _globals['_GRPCGETALLCONTEXTVALUESRESULT']._serialized_start=327
+
+  _globals['_GRPCGETALLCONTEXTVALUESRESULT']._serialized_end=399
+
+  _globals['_GRPCCONTEXTVALUESSERVICE']._serialized_start=402
+
+  _globals['_GRPCCONTEXTVALUESSERVICE']._serialized_end=798
 
 # @@protoc_insertion_point(module_scope)
diff --git a/Ficus/src/python/ficus/grpc_pipelines/models/context_values_service_pb2.pyi b/Ficus/src/python/ficus/grpc_pipelines/models/context_values_service_pb2.pyi
index 9486890d2..b41fbd9ab 100644
--- a/Ficus/src/python/ficus/grpc_pipelines/models/context_values_service_pb2.pyi
+++ b/Ficus/src/python/ficus/grpc_pipelines/models/context_values_service_pb2.pyi
@@ -21,3 +21,17 @@ class GrpcDropContextValuesRequest(_message.Message):
     IDS_FIELD_NUMBER: _ClassVar[int]
     ids: _containers.RepeatedCompositeFieldContainer[_util_pb2.GrpcGuid]
     def __init__(self, ids: _Optional[_Iterable[_Union[_util_pb2.GrpcGuid, _Mapping]]] = ...) -> None: ...
+
+class GrpcGetContextValueRequest(_message.Message):
+    __slots__ = ["executionId", "key"]
+    EXECUTIONID_FIELD_NUMBER: _ClassVar[int]
+    KEY_FIELD_NUMBER: _ClassVar[int]
+    executionId: _util_pb2.GrpcGuid
+    key: _pipelines_and_context_pb2.GrpcContextKey
+    def __init__(self, executionId: _Optional[_Union[_util_pb2.GrpcGuid, _Mapping]] = ..., key: _Optional[_Union[_pipelines_and_context_pb2.GrpcContextKey, _Mapping]] = ...) -> None: ...
+
+class GrpcGetAllContextValuesResult(_message.Message):
+    __slots__ = ["context_values"]
+    CONTEXT_VALUES_FIELD_NUMBER: _ClassVar[int]
+    context_values: _containers.RepeatedCompositeFieldContainer[_util_pb2.GrpcGuid]
+    def __init__(self, context_values: _Optional[_Iterable[_Union[_util_pb2.GrpcGuid, _Mapping]]] = ...) -> None: ...
diff --git a/Ficus/src/python/ficus/grpc_pipelines/models/context_values_service_pb2_grpc.py b/Ficus/src/python/ficus/grpc_pipelines/models/context_values_service_pb2_grpc.py
index 96bca612e..dacb274c1 100644
--- a/Ficus/src/python/ficus/grpc_pipelines/models/context_values_service_pb2_grpc.py
+++ b/Ficus/src/python/ficus/grpc_pipelines/models/context_values_service_pb2_grpc.py
@@ -64,6 +64,26 @@ def __init__(self, channel):
 
                 )
 
+        self.GetContextValueId = channel.unary_unary(
+
+                '/ficus.GrpcContextValuesService/GetContextValueId',
+
+                request_serializer=context__values__service__pb2.GrpcGetContextValueRequest.SerializeToString,
+
+                response_deserializer=util__pb2.GrpcGuid.FromString,
+
+                )
+
+        self.GetAllContextValuesIds = channel.unary_unary(
+
+                '/ficus.GrpcContextValuesService/GetAllContextValuesIds',
+
+                request_serializer=util__pb2.GrpcGuid.SerializeToString,
+
+                response_deserializer=context__values__service__pb2.GrpcGetAllContextValuesResult.FromString,
+
+                )
+
 
 
 
@@ -110,6 +130,30 @@ def DropContextValues(self, request, context):
 
 
 
+    def GetContextValueId(self, request, context):
+
+        """Missing associated documentation comment in .proto file."""
+
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+
+        context.set_details('Method not implemented!')
+
+        raise NotImplementedError('Method not implemented!')
+
+
+
+    def GetAllContextValuesIds(self, request, context):
+
+        """Missing associated documentation comment in .proto file."""
+
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+
+        context.set_details('Method not implemented!')
+
+        raise NotImplementedError('Method not implemented!')
+
+
+
 
 
 def add_GrpcContextValuesServiceServicer_to_server(servicer, server):
@@ -146,6 +190,26 @@ def add_GrpcContextValuesServiceServicer_to_server(servicer, server):
 
             ),
 
+            'GetContextValueId': grpc.unary_unary_rpc_method_handler(
+
+                    servicer.GetContextValueId,
+
+                    request_deserializer=context__values__service__pb2.GrpcGetContextValueRequest.FromString,
+
+                    response_serializer=util__pb2.GrpcGuid.SerializeToString,
+
+            ),
+
+            'GetAllContextValuesIds': grpc.unary_unary_rpc_method_handler(
+
+                    servicer.GetAllContextValuesIds,
+
+                    request_deserializer=util__pb2.GrpcGuid.FromString,
+
+                    response_serializer=context__values__service__pb2.GrpcGetAllContextValuesResult.SerializeToString,
+
+            ),
+
     }
 
     generic_handler = grpc.method_handlers_generic_handler(
@@ -265,3 +329,71 @@ def DropContextValues(request,
             options, channel_credentials,
 
             insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+
+
+    @staticmethod
+
+    def GetContextValueId(request,
+
+            target,
+
+            options=(),
+
+            channel_credentials=None,
+
+            call_credentials=None,
+
+            insecure=False,
+
+            compression=None,
+
+            wait_for_ready=None,
+
+            timeout=None,
+
+            metadata=None):
+
+        return grpc.experimental.unary_unary(request, target, '/ficus.GrpcContextValuesService/GetContextValueId',
+
+            context__values__service__pb2.GrpcGetContextValueRequest.SerializeToString,
+
+            util__pb2.GrpcGuid.FromString,
+
+            options, channel_credentials,
+
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+
+
+    @staticmethod
+
+    def GetAllContextValuesIds(request,
+
+            target,
+
+            options=(),
+
+            channel_credentials=None,
+
+            call_credentials=None,
+
+            insecure=False,
+
+            compression=None,
+
+            wait_for_ready=None,
+
+            timeout=None,
+
+            metadata=None):
+
+        return grpc.experimental.unary_unary(request, target, '/ficus.GrpcContextValuesService/GetAllContextValuesIds',
+
+            util__pb2.GrpcGuid.SerializeToString,
+
+            context__values__service__pb2.GrpcGetAllContextValuesResult.FromString,
+
+            options, channel_credentials,
+
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
diff --git a/Ficus/src/python/ficus/grpc_pipelines/models/front_contract_pb2.py b/Ficus/src/python/ficus/grpc_pipelines/models/front_contract_pb2.py
index 1e9f4aae3..fa3b74166 100644
--- a/Ficus/src/python/ficus/grpc_pipelines/models/front_contract_pb2.py
+++ b/Ficus/src/python/ficus/grpc_pipelines/models/front_contract_pb2.py
@@ -36,7 +36,7 @@
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x66ront_contract.proto\x12\x05\x66icus\x1a\x1bpipelines_and_context.proto\x1a\nutil.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"c\n)GrpcSubscriptionAndPipelinesStateResponse\x12\x36\n\x05\x63\x61ses\x18\x01 \x03(\x0b\x32\'.ficus.GrpcProcessCaseMetadataWithStamp\"c\n GrpcProcessCaseMetadataWithStamp\x12\r\n\x05stamp\x18\x01 \x01(\x04\x12\x30\n\x08metadata\x18\x02 \x01(\x0b\x32\x1e.ficus.GrpcProcessCaseMetadata\"\xb3\x01\n\'GrpcGetPipelineCaseContextValuesRequest\x12\'\n\x0esubscriptionId\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12#\n\npipelineId\x18\x02 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12\x13\n\x0bprocessName\x18\x03 \x01(\t\x12%\n\x08\x63\x61seName\x18\x04 \x01(\x0b\x32\x13.ficus.GrpcCaseName\"\xc0\x01\n\x0fGrpcKafkaUpdate\x12;\n\x13processCaseMetadata\x18\x01 \x01(\x0b\x32\x1e.ficus.GrpcProcessCaseMetadata\x12\x35\n\x10pipelinePartInfo\x18\x02 \x01(\x0b\x32\x1b.ficus.GrpcPipelinePartInfo\x12\x39\n\rcontextValues\x18\x03 \x03(\x0b\x32\".ficus.GrpcContextValueWithKeyName\"\x80\x02\n\x17GrpcProcessCaseMetadata\x12\x13\n\x0bprocessName\x18\x01 \x01(\t\x12%\n\x08\x63\x61seName\x18\x02 \x01(\x0b\x32\x13.ficus.GrpcCaseName\x12\'\n\x0esubscriptionId\x18\x03 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12\x18\n\x10subscriptionName\x18\x04 \x01(\t\x12#\n\npipelineId\x18\x05 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12\x14\n\x0cpipelineName\x18\x06 \x01(\t\x12+\n\x08metadata\x18\x07 \x03(\x0b\x32\x19.ficus.GrpcStringKeyValue\":\n\x0cGrpcCaseName\x12\x13\n\x0b\x64isplayName\x18\x01 \x01(\t\x12\x15\n\rfullNameParts\x18\x02 \x03(\t\"c\n\x15GrpcCaseContextValues\x12;\n\rcontextValues\x18\x01 \x03(\x0b\x32$.ficus.GrpcPipelinePartContextValues\x12\r\n\x05stamp\x18\x02 \x01(\x04\"\xc8\x01\n\x1dGrpcPipelinePartContextValues\x12\x35\n\x10pipelinePartInfo\x18\x01 \x01(\x0b\x32\x1b.ficus.GrpcPipelinePartInfo\x12)\n\x05stamp\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x45\n\x11\x65xecution_results\x18\x03 \x03(\x0b\x32*.ficus.GrpcCasePipelinePartExecutionResult\"`\n#GrpcCasePipelinePartExecutionResult\x12\x39\n\rcontextValues\x18\x03 \x03(\x0b\x32\".ficus.GrpcContextValueWithKeyName\"h\n\x14GrpcPipelinePartInfo\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x1b\n\x02id\x18\x02 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12%\n\x0c\x65xecution_id\x18\x03 \x01(\x0b\x32\x0f.ficus.GrpcGuid2\x82\x02\n%GrpcPipelinePartsContextValuesService\x12l\n GetSubscriptionAndPipelinesState\x12\x16.google.protobuf.Empty\x1a\x30.ficus.GrpcSubscriptionAndPipelinesStateResponse\x12k\n\x1bGetPipelineCaseContextValue\x12..ficus.GrpcGetPipelineCaseContextValuesRequest\x1a\x1c.ficus.GrpcCaseContextValuesB\x0fZ\r./;grpcmodelsb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x14\x66ront_contract.proto\x12\x05\x66icus\x1a\x1bpipelines_and_context.proto\x1a\nutil.proto\x1a\x1bgoogle/protobuf/empty.proto\x1a\x1fgoogle/protobuf/timestamp.proto\"c\n)GrpcSubscriptionAndPipelinesStateResponse\x12\x36\n\x05\x63\x61ses\x18\x01 \x03(\x0b\x32\'.ficus.GrpcProcessCaseMetadataWithStamp\"c\n GrpcProcessCaseMetadataWithStamp\x12\r\n\x05stamp\x18\x01 \x01(\x04\x12\x30\n\x08metadata\x18\x02 \x01(\x0b\x32\x1e.ficus.GrpcProcessCaseMetadata\"\xb3\x01\n\'GrpcGetPipelineCaseContextValuesRequest\x12\'\n\x0esubscriptionId\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12#\n\npipelineId\x18\x02 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12\x13\n\x0bprocessName\x18\x03 \x01(\t\x12%\n\x08\x63\x61seName\x18\x04 \x01(\x0b\x32\x13.ficus.GrpcCaseName\"N\n\x0fGrpcKafkaUpdate\x12;\n\x13processCaseMetadata\x18\x01 \x01(\x0b\x32\x1e.ficus.GrpcProcessCaseMetadata\"h\n\x14GrpcPipelinePartInfo\x12\x0c\n\x04name\x18\x01 \x01(\t\x12\x1b\n\x02id\x18\x02 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12%\n\x0c\x65xecution_id\x18\x03 \x01(\x0b\x32\x0f.ficus.GrpcGuid\"S\n\x16GrpcKafkaContextValues\x12\x39\n\rcontextValues\x18\x01 \x03(\x0b\x32\".ficus.GrpcContextValueWithKeyName\"\x80\x02\n\x17GrpcProcessCaseMetadata\x12\x13\n\x0bprocessName\x18\x01 \x01(\t\x12%\n\x08\x63\x61seName\x18\x02 \x01(\x0b\x32\x13.ficus.GrpcCaseName\x12\'\n\x0esubscriptionId\x18\x03 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12\x18\n\x10subscriptionName\x18\x04 \x01(\t\x12#\n\npipelineId\x18\x05 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12\x14\n\x0cpipelineName\x18\x06 \x01(\t\x12+\n\x08metadata\x18\x07 \x03(\x0b\x32\x19.ficus.GrpcStringKeyValue\":\n\x0cGrpcCaseName\x12\x13\n\x0b\x64isplayName\x18\x01 \x01(\t\x12\x15\n\rfullNameParts\x18\x02 \x03(\t\"c\n\x15GrpcCaseContextValues\x12;\n\rcontextValues\x18\x01 \x03(\x0b\x32$.ficus.GrpcPipelinePartContextValues\x12\r\n\x05stamp\x18\x02 \x01(\x04\"\xc8\x01\n\x1dGrpcPipelinePartContextValues\x12\x35\n\x10pipelinePartInfo\x18\x01 \x01(\x0b\x32\x1b.ficus.GrpcPipelinePartInfo\x12)\n\x05stamp\x18\x02 \x01(\x0b\x32\x1a.google.protobuf.Timestamp\x12\x45\n\x11\x65xecution_results\x18\x03 \x03(\x0b\x32*.ficus.GrpcCasePipelinePartExecutionResult\"`\n#GrpcCasePipelinePartExecutionResult\x12\x39\n\rcontextValues\x18\x03 \x03(\x0b\x32\".ficus.GrpcContextValueWithKeyName2\x82\x02\n%GrpcPipelinePartsContextValuesService\x12l\n GetSubscriptionAndPipelinesState\x12\x16.google.protobuf.Empty\x1a\x30.ficus.GrpcSubscriptionAndPipelinesStateResponse\x12k\n\x1bGetPipelineCaseContextValue\x12..ficus.GrpcGetPipelineCaseContextValuesRequest\x1a\x1c.ficus.GrpcCaseContextValuesB\x0fZ\r./;grpcmodelsb\x06proto3')
 
 
 
@@ -64,36 +64,40 @@
 
   _globals['_GRPCGETPIPELINECASECONTEXTVALUESREQUEST']._serialized_end=516
 
-  _globals['_GRPCKAFKAUPDATE']._serialized_start=519
+  _globals['_GRPCKAFKAUPDATE']._serialized_start=518
 
-  _globals['_GRPCKAFKAUPDATE']._serialized_end=711
+  _globals['_GRPCKAFKAUPDATE']._serialized_end=596
 
-  _globals['_GRPCPROCESSCASEMETADATA']._serialized_start=714
+  _globals['_GRPCPIPELINEPARTINFO']._serialized_start=598
 
-  _globals['_GRPCPROCESSCASEMETADATA']._serialized_end=970
+  _globals['_GRPCPIPELINEPARTINFO']._serialized_end=702
 
-  _globals['_GRPCCASENAME']._serialized_start=972
+  _globals['_GRPCKAFKACONTEXTVALUES']._serialized_start=704
 
-  _globals['_GRPCCASENAME']._serialized_end=1030
+  _globals['_GRPCKAFKACONTEXTVALUES']._serialized_end=787
 
-  _globals['_GRPCCASECONTEXTVALUES']._serialized_start=1032
+  _globals['_GRPCPROCESSCASEMETADATA']._serialized_start=790
 
-  _globals['_GRPCCASECONTEXTVALUES']._serialized_end=1131
+  _globals['_GRPCPROCESSCASEMETADATA']._serialized_end=1046
 
-  _globals['_GRPCPIPELINEPARTCONTEXTVALUES']._serialized_start=1134
+  _globals['_GRPCCASENAME']._serialized_start=1048
 
-  _globals['_GRPCPIPELINEPARTCONTEXTVALUES']._serialized_end=1334
+  _globals['_GRPCCASENAME']._serialized_end=1106
 
-  _globals['_GRPCCASEPIPELINEPARTEXECUTIONRESULT']._serialized_start=1336
+  _globals['_GRPCCASECONTEXTVALUES']._serialized_start=1108
 
-  _globals['_GRPCCASEPIPELINEPARTEXECUTIONRESULT']._serialized_end=1432
+  _globals['_GRPCCASECONTEXTVALUES']._serialized_end=1207
 
-  _globals['_GRPCPIPELINEPARTINFO']._serialized_start=1434
+  _globals['_GRPCPIPELINEPARTCONTEXTVALUES']._serialized_start=1210
 
-  _globals['_GRPCPIPELINEPARTINFO']._serialized_end=1538
+  _globals['_GRPCPIPELINEPARTCONTEXTVALUES']._serialized_end=1410
 
-  _globals['_GRPCPIPELINEPARTSCONTEXTVALUESSERVICE']._serialized_start=1541
+  _globals['_GRPCCASEPIPELINEPARTEXECUTIONRESULT']._serialized_start=1412
 
-  _globals['_GRPCPIPELINEPARTSCONTEXTVALUESSERVICE']._serialized_end=1799
+  _globals['_GRPCCASEPIPELINEPARTEXECUTIONRESULT']._serialized_end=1508
+
+  _globals['_GRPCPIPELINEPARTSCONTEXTVALUESSERVICE']._serialized_start=1511
+
+  _globals['_GRPCPIPELINEPARTSCONTEXTVALUESSERVICE']._serialized_end=1769
 
 # @@protoc_insertion_point(module_scope)
diff --git a/Ficus/src/python/ficus/grpc_pipelines/models/front_contract_pb2.pyi b/Ficus/src/python/ficus/grpc_pipelines/models/front_contract_pb2.pyi
index 8a055f2c0..fd30f4dd3 100644
--- a/Ficus/src/python/ficus/grpc_pipelines/models/front_contract_pb2.pyi
+++ b/Ficus/src/python/ficus/grpc_pipelines/models/front_contract_pb2.pyi
@@ -36,14 +36,26 @@ class GrpcGetPipelineCaseContextValuesRequest(_message.Message):
     def __init__(self, subscriptionId: _Optional[_Union[_util_pb2.GrpcGuid, _Mapping]] = ..., pipelineId: _Optional[_Union[_util_pb2.GrpcGuid, _Mapping]] = ..., processName: _Optional[str] = ..., caseName: _Optional[_Union[GrpcCaseName, _Mapping]] = ...) -> None: ...
 
 class GrpcKafkaUpdate(_message.Message):
-    __slots__ = ["processCaseMetadata", "pipelinePartInfo", "contextValues"]
+    __slots__ = ["processCaseMetadata"]
     PROCESSCASEMETADATA_FIELD_NUMBER: _ClassVar[int]
-    PIPELINEPARTINFO_FIELD_NUMBER: _ClassVar[int]
-    CONTEXTVALUES_FIELD_NUMBER: _ClassVar[int]
     processCaseMetadata: GrpcProcessCaseMetadata
-    pipelinePartInfo: GrpcPipelinePartInfo
+    def __init__(self, processCaseMetadata: _Optional[_Union[GrpcProcessCaseMetadata, _Mapping]] = ...) -> None: ...
+
+class GrpcPipelinePartInfo(_message.Message):
+    __slots__ = ["name", "id", "execution_id"]
+    NAME_FIELD_NUMBER: _ClassVar[int]
+    ID_FIELD_NUMBER: _ClassVar[int]
+    EXECUTION_ID_FIELD_NUMBER: _ClassVar[int]
+    name: str
+    id: _util_pb2.GrpcGuid
+    execution_id: _util_pb2.GrpcGuid
+    def __init__(self, name: _Optional[str] = ..., id: _Optional[_Union[_util_pb2.GrpcGuid, _Mapping]] = ..., execution_id: _Optional[_Union[_util_pb2.GrpcGuid, _Mapping]] = ...) -> None: ...
+
+class GrpcKafkaContextValues(_message.Message):
+    __slots__ = ["contextValues"]
+    CONTEXTVALUES_FIELD_NUMBER: _ClassVar[int]
     contextValues: _containers.RepeatedCompositeFieldContainer[_pipelines_and_context_pb2.GrpcContextValueWithKeyName]
-    def __init__(self, processCaseMetadata: _Optional[_Union[GrpcProcessCaseMetadata, _Mapping]] = ..., pipelinePartInfo: _Optional[_Union[GrpcPipelinePartInfo, _Mapping]] = ..., contextValues: _Optional[_Iterable[_Union[_pipelines_and_context_pb2.GrpcContextValueWithKeyName, _Mapping]]] = ...) -> None: ...
+    def __init__(self, contextValues: _Optional[_Iterable[_Union[_pipelines_and_context_pb2.GrpcContextValueWithKeyName, _Mapping]]] = ...) -> None: ...
 
 class GrpcProcessCaseMetadata(_message.Message):
     __slots__ = ["processName", "caseName", "subscriptionId", "subscriptionName", "pipelineId", "pipelineName", "metadata"]
@@ -94,13 +106,3 @@ class GrpcCasePipelinePartExecutionResult(_message.Message):
     CONTEXTVALUES_FIELD_NUMBER: _ClassVar[int]
     contextValues: _containers.RepeatedCompositeFieldContainer[_pipelines_and_context_pb2.GrpcContextValueWithKeyName]
     def __init__(self, contextValues: _Optional[_Iterable[_Union[_pipelines_and_context_pb2.GrpcContextValueWithKeyName, _Mapping]]] = ...) -> None: ...
-
-class GrpcPipelinePartInfo(_message.Message):
-    __slots__ = ["name", "id", "execution_id"]
-    NAME_FIELD_NUMBER: _ClassVar[int]
-    ID_FIELD_NUMBER: _ClassVar[int]
-    EXECUTION_ID_FIELD_NUMBER: _ClassVar[int]
-    name: str
-    id: _util_pb2.GrpcGuid
-    execution_id: _util_pb2.GrpcGuid
-    def __init__(self, name: _Optional[str] = ..., id: _Optional[_Union[_util_pb2.GrpcGuid, _Mapping]] = ..., execution_id: _Optional[_Union[_util_pb2.GrpcGuid, _Mapping]] = ...) -> None: ...
diff --git a/Ficus/src/python/ficus/grpc_pipelines/models/kafka_service_pb2.py b/Ficus/src/python/ficus/grpc_pipelines/models/kafka_service_pb2.py
index 2868d5b05..3399c63a1 100644
--- a/Ficus/src/python/ficus/grpc_pipelines/models/kafka_service_pb2.py
+++ b/Ficus/src/python/ficus/grpc_pipelines/models/kafka_service_pb2.py
@@ -36,7 +36,7 @@
 
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13kafka_service.proto\x12\x05\x66icus\x1a\x1bpipelines_and_context.proto\x1a\nutil.proto\x1a\x15\x62\x61\x63kend_service.proto\x1a\x1bgoogle/protobuf/empty.proto\"\xd4\x02\n)GrpcExecutePipelineAndProduceKafkaRequest\x12\x41\n\x0fpipelineRequest\x18\x01 \x01(\x0b\x32(.ficus.GrpcProxyPipelineExecutionRequest\x12<\n\x10producerMetadata\x18\x02 \x01(\x0b\x32\".ficus.GrpcKafkaConnectionMetadata\x12(\n\x08\x63\x61seInfo\x18\x03 \x01(\x0b\x32\x16.ficus.GrpcProcessInfo\x12\'\n\x0esubscriptionId\x18\x04 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12#\n\npipelineId\x18\x05 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12\x14\n\x0cpipelineName\x18\x06 \x01(\t\x12\x18\n\x10subscriptionName\x18\x07 \x01(\t\"8\n\x0fGrpcProcessInfo\x12\x13\n\x0bprocessName\x18\x01 \x01(\t\x12\x10\n\x08\x63\x61seName\x18\x02 \x01(\t\"\xa1\x01\n\x1bGrpcSubscribeToKafkaRequest\x12>\n\x12\x63onnectionMetadata\x18\x01 \x01(\x0b\x32\".ficus.GrpcKafkaConnectionMetadata\x12\x42\n\x14subscriptionMetadata\x18\x02 \x01(\x0b\x32$.ficus.GrpcKafkaSubscriptionMetadata\"9\n\x1dGrpcKafkaSubscriptionMetadata\x12\x18\n\x10subscriptionName\x18\x01 \x01(\t\"\x8c\x02\n!GrpcKafkaPipelineExecutionRequest\x12\'\n\x0esubscriptionId\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12<\n\x0fpipelineRequest\x18\x02 \x01(\x0b\x32#.ficus.GrpcPipelineExecutionRequest\x12\x35\n\x10pipelineMetadata\x18\x03 \x01(\x0b\x32\x1b.ficus.GrpcPipelineMetadata\x12I\n\x16streamingConfiguration\x18\x04 \x01(\x0b\x32).ficus.GrpcPipelineStreamingConfiguration\"$\n\x14GrpcPipelineMetadata\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x9e\x01\n\x16GrpcAddPipelineRequest\x12\x41\n\x0fpipelineRequest\x18\x01 \x01(\x0b\x32(.ficus.GrpcKafkaPipelineExecutionRequest\x12\x41\n\x15producerKafkaMetadata\x18\x02 \x01(\x0b\x32\".ficus.GrpcKafkaConnectionMetadata\"\xe5\x01\n\"GrpcPipelineStreamingConfiguration\x12.\n\x0cnotSpecified\x18\x01 \x01(\x0b\x32\x16.google.protobuf.EmptyH\x00\x12>\n\x0ft1Configuration\x18\x02 \x01(\x0b\x32#.ficus.GrpcT1StreamingConfigurationH\x00\x12>\n\x0ft2Configuration\x18\x03 \x01(\x0b\x32#.ficus.GrpcT2StreamingConfigurationH\x00\x42\x0f\n\rconfiguration\"\xf5\x01\n\x1cGrpcT1StreamingConfiguration\x12<\n\reventsTimeout\x18\x01 \x01(\x0b\x32#.ficus.GrpcT1EventsTimeBasedCachingH\x00\x12;\n\rtracesTimeout\x18\x02 \x01(\x0b\x32\".ficus.GrpcT1TraceTimeBasedCachingH\x00\x12I\n\x18tracesQueueConfiguration\x18\x03 \x01(\x0b\x32%.ficus.GrpcT1TracesQueueConfigurationH\x00\x42\x0f\n\rconfiguration\"7\n\x1eGrpcT1TracesQueueConfiguration\x12\x15\n\rqueueCapacity\x18\x01 \x01(\x03\"7\n\x1cGrpcT1EventsTimeBasedCaching\x12\x17\n\x0f\x65ventsTimeoutMs\x18\x01 \x01(\x03\"6\n\x1bGrpcT1TraceTimeBasedCaching\x12\x17\n\x0ftracesTimeoutMs\x18\x01 \x01(\x03\"\xf5\x01\n\x1cGrpcT2StreamingConfiguration\x12:\n\nlossyCount\x18\x01 \x01(\x0b\x32$.ficus.GrpcT2LossyCountConfigurationH\x00\x12J\n\x12timedSlidingWindow\x18\x02 \x01(\x0b\x32,.ficus.GrpcT2TimedSlidingWindowConfigurationH\x00\x12<\n\x1fincomingTracesFilteringPipeline\x18\x03 \x01(\x0b\x32\x13.ficus.GrpcPipelineB\x0f\n\rconfiguration\"?\n\x1dGrpcT2LossyCountConfiguration\x12\r\n\x05\x65rror\x18\x01 \x01(\x01\x12\x0f\n\x07support\x18\x02 \x01(\x01\";\n%GrpcT2TimedSlidingWindowConfiguration\x12\x12\n\nlifespanMs\x18\x01 \x01(\x03\"a\n\x1cGrpcAddPipelineStreamRequest\x12\x41\n\x0fpipelineRequest\x18\x01 \x01(\x0b\x32(.ficus.GrpcKafkaPipelineExecutionRequest\"i\n\x19GrpcRemovePipelineRequest\x12\'\n\x0esubscriptionId\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12#\n\npipelineId\x18\x02 \x01(\x0b\x32\x0f.ficus.GrpcGuid\"H\n\x1dGrpcRemoveAllPipelinesRequest\x12\'\n\x0esubscriptionId\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\"\\\n\x1bGrpcKafkaConnectionMetadata\x12\x11\n\ttopicName\x18\x01 \x01(\t\x12*\n\x08metadata\x18\x02 \x03(\x0b\x32\x18.ficus.GrpcKafkaMetadata\"/\n\x11GrpcKafkaMetadata\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"~\n\x0fGrpcKafkaResult\x12\x30\n\x07success\x18\x01 \x01(\x0b\x32\x1d.ficus.GrpcKafkaSuccessResultH\x00\x12/\n\x07\x66\x61ilure\x18\x02 \x01(\x0b\x32\x1c.ficus.GrpcKafkaFailedResultH\x00\x42\x08\n\x06result\"5\n\x16GrpcKafkaSuccessResult\x12\x1b\n\x02id\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\"-\n\x15GrpcKafkaFailedResult\x12\x14\n\x0c\x65rrorMessage\x18\x01 \x01(\t\"J\n\x1fGrpcUnsubscribeFromKafkaRequest\x12\'\n\x0esubscriptionId\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\"b\n+GrpcGetAllSubscriptionsAndPipelinesResponse\x12\x33\n\rsubscriptions\x18\x01 \x03(\x0b\x32\x1c.ficus.GrpcKafkaSubscription\"\xa0\x01\n\x15GrpcKafkaSubscription\x12\x1b\n\x02id\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12\x36\n\x08metadata\x18\x02 \x01(\x0b\x32$.ficus.GrpcKafkaSubscriptionMetadata\x12\x32\n\tpipelines\x18\x03 \x03(\x0b\x32\x1f.ficus.GrpcSubscriptionPipeline\"f\n\x18GrpcSubscriptionPipeline\x12\x1b\n\x02id\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12-\n\x08metadata\x18\x02 \x01(\x0b\x32\x1b.ficus.GrpcPipelineMetadata2\xb2\x06\n\x10GrpcKafkaService\x12T\n\x16SubscribeForKafkaTopic\x12\".ficus.GrpcSubscribeToKafkaRequest\x1a\x16.ficus.GrpcKafkaResult\x12[\n\x19UnsubscribeFromKafkaTopic\x12&.ficus.GrpcUnsubscribeFromKafkaRequest\x1a\x16.ficus.GrpcKafkaResult\x12R\n\x19\x41\x64\x64PipelineToSubscription\x12\x1d.ficus.GrpcAddPipelineRequest\x1a\x16.ficus.GrpcKafkaResult\x12p\n\x1f\x41\x64\x64PipelineToSubscriptionStream\x12#.ficus.GrpcAddPipelineStreamRequest\x1a&.ficus.GrpcPipelinePartExecutionResult0\x01\x12V\n\x1aRemovePipelineSubscription\x12 .ficus.GrpcRemovePipelineRequest\x1a\x16.ficus.GrpcKafkaResult\x12^\n\x1eRemoveAllPipelineSubscriptions\x12$.ficus.GrpcRemoveAllPipelinesRequest\x1a\x16.ficus.GrpcKafkaResult\x12m\n\x1fGetAllSubscriptionsAndPipelines\x12\x16.google.protobuf.Empty\x1a\x32.ficus.GrpcGetAllSubscriptionsAndPipelinesResponse\x12~\n ExecutePipelineAndProduceToKafka\x12\x30.ficus.GrpcExecutePipelineAndProduceKafkaRequest\x1a&.ficus.GrpcPipelinePartExecutionResult0\x01\x42\x0fZ\r./;grpcmodelsb\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n\x13kafka_service.proto\x12\x05\x66icus\x1a\x1bpipelines_and_context.proto\x1a\nutil.proto\x1a\x15\x62\x61\x63kend_service.proto\x1a\x1bgoogle/protobuf/empty.proto\"\x84\x01\n\"GrpcGetCurrentContextValuesRequest\x12\'\n\x0esubscriptionId\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12#\n\npipelineId\x18\x02 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12\x10\n\x08\x63\x61seName\x18\x03 \x01(\t\"\xd4\x02\n)GrpcExecutePipelineAndProduceKafkaRequest\x12\x41\n\x0fpipelineRequest\x18\x01 \x01(\x0b\x32(.ficus.GrpcProxyPipelineExecutionRequest\x12<\n\x10producerMetadata\x18\x02 \x01(\x0b\x32\".ficus.GrpcKafkaConnectionMetadata\x12(\n\x08\x63\x61seInfo\x18\x03 \x01(\x0b\x32\x16.ficus.GrpcProcessInfo\x12\'\n\x0esubscriptionId\x18\x04 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12#\n\npipelineId\x18\x05 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12\x14\n\x0cpipelineName\x18\x06 \x01(\t\x12\x18\n\x10subscriptionName\x18\x07 \x01(\t\"8\n\x0fGrpcProcessInfo\x12\x13\n\x0bprocessName\x18\x01 \x01(\t\x12\x10\n\x08\x63\x61seName\x18\x02 \x01(\t\"\xa1\x01\n\x1bGrpcSubscribeToKafkaRequest\x12>\n\x12\x63onnectionMetadata\x18\x01 \x01(\x0b\x32\".ficus.GrpcKafkaConnectionMetadata\x12\x42\n\x14subscriptionMetadata\x18\x02 \x01(\x0b\x32$.ficus.GrpcKafkaSubscriptionMetadata\"9\n\x1dGrpcKafkaSubscriptionMetadata\x12\x18\n\x10subscriptionName\x18\x01 \x01(\t\"\x8c\x02\n!GrpcKafkaPipelineExecutionRequest\x12\'\n\x0esubscriptionId\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12<\n\x0fpipelineRequest\x18\x02 \x01(\x0b\x32#.ficus.GrpcPipelineExecutionRequest\x12\x35\n\x10pipelineMetadata\x18\x03 \x01(\x0b\x32\x1b.ficus.GrpcPipelineMetadata\x12I\n\x16streamingConfiguration\x18\x04 \x01(\x0b\x32).ficus.GrpcPipelineStreamingConfiguration\"$\n\x14GrpcPipelineMetadata\x12\x0c\n\x04name\x18\x01 \x01(\t\"\x9e\x01\n\x16GrpcAddPipelineRequest\x12\x41\n\x0fpipelineRequest\x18\x01 \x01(\x0b\x32(.ficus.GrpcKafkaPipelineExecutionRequest\x12\x41\n\x15producerKafkaMetadata\x18\x02 \x01(\x0b\x32\".ficus.GrpcKafkaConnectionMetadata\"\xe5\x01\n\"GrpcPipelineStreamingConfiguration\x12.\n\x0cnotSpecified\x18\x01 \x01(\x0b\x32\x16.google.protobuf.EmptyH\x00\x12>\n\x0ft1Configuration\x18\x02 \x01(\x0b\x32#.ficus.GrpcT1StreamingConfigurationH\x00\x12>\n\x0ft2Configuration\x18\x03 \x01(\x0b\x32#.ficus.GrpcT2StreamingConfigurationH\x00\x42\x0f\n\rconfiguration\"\xf5\x01\n\x1cGrpcT1StreamingConfiguration\x12<\n\reventsTimeout\x18\x01 \x01(\x0b\x32#.ficus.GrpcT1EventsTimeBasedCachingH\x00\x12;\n\rtracesTimeout\x18\x02 \x01(\x0b\x32\".ficus.GrpcT1TraceTimeBasedCachingH\x00\x12I\n\x18tracesQueueConfiguration\x18\x03 \x01(\x0b\x32%.ficus.GrpcT1TracesQueueConfigurationH\x00\x42\x0f\n\rconfiguration\"7\n\x1eGrpcT1TracesQueueConfiguration\x12\x15\n\rqueueCapacity\x18\x01 \x01(\x03\"7\n\x1cGrpcT1EventsTimeBasedCaching\x12\x17\n\x0f\x65ventsTimeoutMs\x18\x01 \x01(\x03\"6\n\x1bGrpcT1TraceTimeBasedCaching\x12\x17\n\x0ftracesTimeoutMs\x18\x01 \x01(\x03\"\xf5\x01\n\x1cGrpcT2StreamingConfiguration\x12:\n\nlossyCount\x18\x01 \x01(\x0b\x32$.ficus.GrpcT2LossyCountConfigurationH\x00\x12J\n\x12timedSlidingWindow\x18\x02 \x01(\x0b\x32,.ficus.GrpcT2TimedSlidingWindowConfigurationH\x00\x12<\n\x1fincomingTracesFilteringPipeline\x18\x03 \x01(\x0b\x32\x13.ficus.GrpcPipelineB\x0f\n\rconfiguration\"?\n\x1dGrpcT2LossyCountConfiguration\x12\r\n\x05\x65rror\x18\x01 \x01(\x01\x12\x0f\n\x07support\x18\x02 \x01(\x01\";\n%GrpcT2TimedSlidingWindowConfiguration\x12\x12\n\nlifespanMs\x18\x01 \x01(\x03\"a\n\x1cGrpcAddPipelineStreamRequest\x12\x41\n\x0fpipelineRequest\x18\x01 \x01(\x0b\x32(.ficus.GrpcKafkaPipelineExecutionRequest\"i\n\x19GrpcRemovePipelineRequest\x12\'\n\x0esubscriptionId\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12#\n\npipelineId\x18\x02 \x01(\x0b\x32\x0f.ficus.GrpcGuid\"H\n\x1dGrpcRemoveAllPipelinesRequest\x12\'\n\x0esubscriptionId\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\"\\\n\x1bGrpcKafkaConnectionMetadata\x12\x11\n\ttopicName\x18\x01 \x01(\t\x12*\n\x08metadata\x18\x02 \x03(\x0b\x32\x18.ficus.GrpcKafkaMetadata\"/\n\x11GrpcKafkaMetadata\x12\x0b\n\x03key\x18\x01 \x01(\t\x12\r\n\x05value\x18\x02 \x01(\t\"~\n\x0fGrpcKafkaResult\x12\x30\n\x07success\x18\x01 \x01(\x0b\x32\x1d.ficus.GrpcKafkaSuccessResultH\x00\x12/\n\x07\x66\x61ilure\x18\x02 \x01(\x0b\x32\x1c.ficus.GrpcKafkaFailedResultH\x00\x42\x08\n\x06result\"5\n\x16GrpcKafkaSuccessResult\x12\x1b\n\x02id\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\"-\n\x15GrpcKafkaFailedResult\x12\x14\n\x0c\x65rrorMessage\x18\x01 \x01(\t\"J\n\x1fGrpcUnsubscribeFromKafkaRequest\x12\'\n\x0esubscriptionId\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\"b\n+GrpcGetAllSubscriptionsAndPipelinesResponse\x12\x33\n\rsubscriptions\x18\x01 \x03(\x0b\x32\x1c.ficus.GrpcKafkaSubscription\"\xa0\x01\n\x15GrpcKafkaSubscription\x12\x1b\n\x02id\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12\x36\n\x08metadata\x18\x02 \x01(\x0b\x32$.ficus.GrpcKafkaSubscriptionMetadata\x12\x32\n\tpipelines\x18\x03 \x03(\x0b\x32\x1f.ficus.GrpcSubscriptionPipeline\"f\n\x18GrpcSubscriptionPipeline\x12\x1b\n\x02id\x18\x01 \x01(\x0b\x32\x0f.ficus.GrpcGuid\x12-\n\x08metadata\x18\x02 \x01(\x0b\x32\x1b.ficus.GrpcPipelineMetadata2\xa2\x07\n\x10GrpcKafkaService\x12T\n\x16SubscribeForKafkaTopic\x12\".ficus.GrpcSubscribeToKafkaRequest\x1a\x16.ficus.GrpcKafkaResult\x12[\n\x19UnsubscribeFromKafkaTopic\x12&.ficus.GrpcUnsubscribeFromKafkaRequest\x1a\x16.ficus.GrpcKafkaResult\x12n\n\x17GetCurrentContextValues\x12).ficus.GrpcGetCurrentContextValuesRequest\x1a&.ficus.GrpcPipelinePartExecutionResult0\x01\x12R\n\x19\x41\x64\x64PipelineToSubscription\x12\x1d.ficus.GrpcAddPipelineRequest\x1a\x16.ficus.GrpcKafkaResult\x12p\n\x1f\x41\x64\x64PipelineToSubscriptionStream\x12#.ficus.GrpcAddPipelineStreamRequest\x1a&.ficus.GrpcPipelinePartExecutionResult0\x01\x12V\n\x1aRemovePipelineSubscription\x12 .ficus.GrpcRemovePipelineRequest\x1a\x16.ficus.GrpcKafkaResult\x12^\n\x1eRemoveAllPipelineSubscriptions\x12$.ficus.GrpcRemoveAllPipelinesRequest\x1a\x16.ficus.GrpcKafkaResult\x12m\n\x1fGetAllSubscriptionsAndPipelines\x12\x16.google.protobuf.Empty\x1a\x32.ficus.GrpcGetAllSubscriptionsAndPipelinesResponse\x12~\n ExecutePipelineAndProduceToKafka\x12\x30.ficus.GrpcExecutePipelineAndProduceKafkaRequest\x1a&.ficus.GrpcPipelinePartExecutionResult0\x01\x42\x0fZ\r./;grpcmodelsb\x06proto3')
 
 
 
@@ -52,116 +52,120 @@
 
   DESCRIPTOR._serialized_options = b'Z\r./;grpcmodels'
 
-  _globals['_GRPCEXECUTEPIPELINEANDPRODUCEKAFKAREQUEST']._serialized_start=124
+  _globals['_GRPCGETCURRENTCONTEXTVALUESREQUEST']._serialized_start=124
 
-  _globals['_GRPCEXECUTEPIPELINEANDPRODUCEKAFKAREQUEST']._serialized_end=464
+  _globals['_GRPCGETCURRENTCONTEXTVALUESREQUEST']._serialized_end=256
 
-  _globals['_GRPCPROCESSINFO']._serialized_start=466
+  _globals['_GRPCEXECUTEPIPELINEANDPRODUCEKAFKAREQUEST']._serialized_start=259
 
-  _globals['_GRPCPROCESSINFO']._serialized_end=522
+  _globals['_GRPCEXECUTEPIPELINEANDPRODUCEKAFKAREQUEST']._serialized_end=599
 
-  _globals['_GRPCSUBSCRIBETOKAFKAREQUEST']._serialized_start=525
+  _globals['_GRPCPROCESSINFO']._serialized_start=601
 
-  _globals['_GRPCSUBSCRIBETOKAFKAREQUEST']._serialized_end=686
+  _globals['_GRPCPROCESSINFO']._serialized_end=657
 
-  _globals['_GRPCKAFKASUBSCRIPTIONMETADATA']._serialized_start=688
+  _globals['_GRPCSUBSCRIBETOKAFKAREQUEST']._serialized_start=660
 
-  _globals['_GRPCKAFKASUBSCRIPTIONMETADATA']._serialized_end=745
+  _globals['_GRPCSUBSCRIBETOKAFKAREQUEST']._serialized_end=821
 
-  _globals['_GRPCKAFKAPIPELINEEXECUTIONREQUEST']._serialized_start=748
+  _globals['_GRPCKAFKASUBSCRIPTIONMETADATA']._serialized_start=823
 
-  _globals['_GRPCKAFKAPIPELINEEXECUTIONREQUEST']._serialized_end=1016
+  _globals['_GRPCKAFKASUBSCRIPTIONMETADATA']._serialized_end=880
 
-  _globals['_GRPCPIPELINEMETADATA']._serialized_start=1018
+  _globals['_GRPCKAFKAPIPELINEEXECUTIONREQUEST']._serialized_start=883
 
-  _globals['_GRPCPIPELINEMETADATA']._serialized_end=1054
+  _globals['_GRPCKAFKAPIPELINEEXECUTIONREQUEST']._serialized_end=1151
 
-  _globals['_GRPCADDPIPELINEREQUEST']._serialized_start=1057
+  _globals['_GRPCPIPELINEMETADATA']._serialized_start=1153
 
-  _globals['_GRPCADDPIPELINEREQUEST']._serialized_end=1215
+  _globals['_GRPCPIPELINEMETADATA']._serialized_end=1189
 
-  _globals['_GRPCPIPELINESTREAMINGCONFIGURATION']._serialized_start=1218
+  _globals['_GRPCADDPIPELINEREQUEST']._serialized_start=1192
 
-  _globals['_GRPCPIPELINESTREAMINGCONFIGURATION']._serialized_end=1447
+  _globals['_GRPCADDPIPELINEREQUEST']._serialized_end=1350
 
-  _globals['_GRPCT1STREAMINGCONFIGURATION']._serialized_start=1450
+  _globals['_GRPCPIPELINESTREAMINGCONFIGURATION']._serialized_start=1353
 
-  _globals['_GRPCT1STREAMINGCONFIGURATION']._serialized_end=1695
+  _globals['_GRPCPIPELINESTREAMINGCONFIGURATION']._serialized_end=1582
 
-  _globals['_GRPCT1TRACESQUEUECONFIGURATION']._serialized_start=1697
+  _globals['_GRPCT1STREAMINGCONFIGURATION']._serialized_start=1585
 
-  _globals['_GRPCT1TRACESQUEUECONFIGURATION']._serialized_end=1752
+  _globals['_GRPCT1STREAMINGCONFIGURATION']._serialized_end=1830
 
-  _globals['_GRPCT1EVENTSTIMEBASEDCACHING']._serialized_start=1754
+  _globals['_GRPCT1TRACESQUEUECONFIGURATION']._serialized_start=1832
 
-  _globals['_GRPCT1EVENTSTIMEBASEDCACHING']._serialized_end=1809
+  _globals['_GRPCT1TRACESQUEUECONFIGURATION']._serialized_end=1887
 
-  _globals['_GRPCT1TRACETIMEBASEDCACHING']._serialized_start=1811
+  _globals['_GRPCT1EVENTSTIMEBASEDCACHING']._serialized_start=1889
 
-  _globals['_GRPCT1TRACETIMEBASEDCACHING']._serialized_end=1865
+  _globals['_GRPCT1EVENTSTIMEBASEDCACHING']._serialized_end=1944
 
-  _globals['_GRPCT2STREAMINGCONFIGURATION']._serialized_start=1868
+  _globals['_GRPCT1TRACETIMEBASEDCACHING']._serialized_start=1946
 
-  _globals['_GRPCT2STREAMINGCONFIGURATION']._serialized_end=2113
+  _globals['_GRPCT1TRACETIMEBASEDCACHING']._serialized_end=2000
 
-  _globals['_GRPCT2LOSSYCOUNTCONFIGURATION']._serialized_start=2115
+  _globals['_GRPCT2STREAMINGCONFIGURATION']._serialized_start=2003
 
-  _globals['_GRPCT2LOSSYCOUNTCONFIGURATION']._serialized_end=2178
+  _globals['_GRPCT2STREAMINGCONFIGURATION']._serialized_end=2248
 
-  _globals['_GRPCT2TIMEDSLIDINGWINDOWCONFIGURATION']._serialized_start=2180
+  _globals['_GRPCT2LOSSYCOUNTCONFIGURATION']._serialized_start=2250
 
-  _globals['_GRPCT2TIMEDSLIDINGWINDOWCONFIGURATION']._serialized_end=2239
+  _globals['_GRPCT2LOSSYCOUNTCONFIGURATION']._serialized_end=2313
 
-  _globals['_GRPCADDPIPELINESTREAMREQUEST']._serialized_start=2241
+  _globals['_GRPCT2TIMEDSLIDINGWINDOWCONFIGURATION']._serialized_start=2315
 
-  _globals['_GRPCADDPIPELINESTREAMREQUEST']._serialized_end=2338
+  _globals['_GRPCT2TIMEDSLIDINGWINDOWCONFIGURATION']._serialized_end=2374
 
-  _globals['_GRPCREMOVEPIPELINEREQUEST']._serialized_start=2340
+  _globals['_GRPCADDPIPELINESTREAMREQUEST']._serialized_start=2376
 
-  _globals['_GRPCREMOVEPIPELINEREQUEST']._serialized_end=2445
+  _globals['_GRPCADDPIPELINESTREAMREQUEST']._serialized_end=2473
 
-  _globals['_GRPCREMOVEALLPIPELINESREQUEST']._serialized_start=2447
+  _globals['_GRPCREMOVEPIPELINEREQUEST']._serialized_start=2475
 
-  _globals['_GRPCREMOVEALLPIPELINESREQUEST']._serialized_end=2519
+  _globals['_GRPCREMOVEPIPELINEREQUEST']._serialized_end=2580
 
-  _globals['_GRPCKAFKACONNECTIONMETADATA']._serialized_start=2521
+  _globals['_GRPCREMOVEALLPIPELINESREQUEST']._serialized_start=2582
 
-  _globals['_GRPCKAFKACONNECTIONMETADATA']._serialized_end=2613
+  _globals['_GRPCREMOVEALLPIPELINESREQUEST']._serialized_end=2654
 
-  _globals['_GRPCKAFKAMETADATA']._serialized_start=2615
+  _globals['_GRPCKAFKACONNECTIONMETADATA']._serialized_start=2656
 
-  _globals['_GRPCKAFKAMETADATA']._serialized_end=2662
+  _globals['_GRPCKAFKACONNECTIONMETADATA']._serialized_end=2748
 
-  _globals['_GRPCKAFKARESULT']._serialized_start=2664
+  _globals['_GRPCKAFKAMETADATA']._serialized_start=2750
 
-  _globals['_GRPCKAFKARESULT']._serialized_end=2790
+  _globals['_GRPCKAFKAMETADATA']._serialized_end=2797
 
-  _globals['_GRPCKAFKASUCCESSRESULT']._serialized_start=2792
+  _globals['_GRPCKAFKARESULT']._serialized_start=2799
 
-  _globals['_GRPCKAFKASUCCESSRESULT']._serialized_end=2845
+  _globals['_GRPCKAFKARESULT']._serialized_end=2925
 
-  _globals['_GRPCKAFKAFAILEDRESULT']._serialized_start=2847
+  _globals['_GRPCKAFKASUCCESSRESULT']._serialized_start=2927
 
-  _globals['_GRPCKAFKAFAILEDRESULT']._serialized_end=2892
+  _globals['_GRPCKAFKASUCCESSRESULT']._serialized_end=2980
 
-  _globals['_GRPCUNSUBSCRIBEFROMKAFKAREQUEST']._serialized_start=2894
+  _globals['_GRPCKAFKAFAILEDRESULT']._serialized_start=2982
 
-  _globals['_GRPCUNSUBSCRIBEFROMKAFKAREQUEST']._serialized_end=2968
+  _globals['_GRPCKAFKAFAILEDRESULT']._serialized_end=3027
 
-  _globals['_GRPCGETALLSUBSCRIPTIONSANDPIPELINESRESPONSE']._serialized_start=2970
+  _globals['_GRPCUNSUBSCRIBEFROMKAFKAREQUEST']._serialized_start=3029
 
-  _globals['_GRPCGETALLSUBSCRIPTIONSANDPIPELINESRESPONSE']._serialized_end=3068
+  _globals['_GRPCUNSUBSCRIBEFROMKAFKAREQUEST']._serialized_end=3103
 
-  _globals['_GRPCKAFKASUBSCRIPTION']._serialized_start=3071
+  _globals['_GRPCGETALLSUBSCRIPTIONSANDPIPELINESRESPONSE']._serialized_start=3105
 
-  _globals['_GRPCKAFKASUBSCRIPTION']._serialized_end=3231
+  _globals['_GRPCGETALLSUBSCRIPTIONSANDPIPELINESRESPONSE']._serialized_end=3203
 
-  _globals['_GRPCSUBSCRIPTIONPIPELINE']._serialized_start=3233
+  _globals['_GRPCKAFKASUBSCRIPTION']._serialized_start=3206
 
-  _globals['_GRPCSUBSCRIPTIONPIPELINE']._serialized_end=3335
+  _globals['_GRPCKAFKASUBSCRIPTION']._serialized_end=3366
 
-  _globals['_GRPCKAFKASERVICE']._serialized_start=3338
+  _globals['_GRPCSUBSCRIPTIONPIPELINE']._serialized_start=3368
 
-  _globals['_GRPCKAFKASERVICE']._serialized_end=4156
+  _globals['_GRPCSUBSCRIPTIONPIPELINE']._serialized_end=3470
+
+  _globals['_GRPCKAFKASERVICE']._serialized_start=3473
+
+  _globals['_GRPCKAFKASERVICE']._serialized_end=4403
 
 # @@protoc_insertion_point(module_scope)
diff --git a/Ficus/src/python/ficus/grpc_pipelines/models/kafka_service_pb2.pyi b/Ficus/src/python/ficus/grpc_pipelines/models/kafka_service_pb2.pyi
index 9cc0dbe70..e8d7c8de4 100644
--- a/Ficus/src/python/ficus/grpc_pipelines/models/kafka_service_pb2.pyi
+++ b/Ficus/src/python/ficus/grpc_pipelines/models/kafka_service_pb2.pyi
@@ -9,6 +9,16 @@ from typing import ClassVar as _ClassVar, Iterable as _Iterable, Mapping as _Map
 
 DESCRIPTOR: _descriptor.FileDescriptor
 
+class GrpcGetCurrentContextValuesRequest(_message.Message):
+    __slots__ = ["subscriptionId", "pipelineId", "caseName"]
+    SUBSCRIPTIONID_FIELD_NUMBER: _ClassVar[int]
+    PIPELINEID_FIELD_NUMBER: _ClassVar[int]
+    CASENAME_FIELD_NUMBER: _ClassVar[int]
+    subscriptionId: _util_pb2.GrpcGuid
+    pipelineId: _util_pb2.GrpcGuid
+    caseName: str
+    def __init__(self, subscriptionId: _Optional[_Union[_util_pb2.GrpcGuid, _Mapping]] = ..., pipelineId: _Optional[_Union[_util_pb2.GrpcGuid, _Mapping]] = ..., caseName: _Optional[str] = ...) -> None: ...
+
 class GrpcExecutePipelineAndProduceKafkaRequest(_message.Message):
     __slots__ = ["pipelineRequest", "producerMetadata", "caseInfo", "subscriptionId", "pipelineId", "pipelineName", "subscriptionName"]
     PIPELINEREQUEST_FIELD_NUMBER: _ClassVar[int]
diff --git a/Ficus/src/python/ficus/grpc_pipelines/models/kafka_service_pb2_grpc.py b/Ficus/src/python/ficus/grpc_pipelines/models/kafka_service_pb2_grpc.py
index 62aa4f9ee..acab3f387 100644
--- a/Ficus/src/python/ficus/grpc_pipelines/models/kafka_service_pb2_grpc.py
+++ b/Ficus/src/python/ficus/grpc_pipelines/models/kafka_service_pb2_grpc.py
@@ -54,6 +54,16 @@ def __init__(self, channel):
 
                 )
 
+        self.GetCurrentContextValues = channel.unary_stream(
+
+                '/ficus.GrpcKafkaService/GetCurrentContextValues',
+
+                request_serializer=kafka__service__pb2.GrpcGetCurrentContextValuesRequest.SerializeToString,
+
+                response_deserializer=backend__service__pb2.GrpcPipelinePartExecutionResult.FromString,
+
+                )
+
         self.AddPipelineToSubscription = channel.unary_unary(
 
                 '/ficus.GrpcKafkaService/AddPipelineToSubscription',
@@ -148,6 +158,18 @@ def UnsubscribeFromKafkaTopic(self, request, context):
 
 
 
+    def GetCurrentContextValues(self, request, context):
+
+        """Missing associated documentation comment in .proto file."""
+
+        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
+
+        context.set_details('Method not implemented!')
+
+        raise NotImplementedError('Method not implemented!')
+
+
+
     def AddPipelineToSubscription(self, request, context):
 
         """Missing associated documentation comment in .proto file."""
@@ -246,6 +268,16 @@ def add_GrpcKafkaServiceServicer_to_server(servicer, server):
 
             ),
 
+            'GetCurrentContextValues': grpc.unary_stream_rpc_method_handler(
+
+                    servicer.GetCurrentContextValues,
+
+                    request_deserializer=kafka__service__pb2.GrpcGetCurrentContextValuesRequest.FromString,
+
+                    response_serializer=backend__service__pb2.GrpcPipelinePartExecutionResult.SerializeToString,
+
+            ),
+
             'AddPipelineToSubscription': grpc.unary_unary_rpc_method_handler(
 
                     servicer.AddPipelineToSubscription,
@@ -394,6 +426,40 @@ def UnsubscribeFromKafkaTopic(request,
 
 
 
+    @staticmethod
+
+    def GetCurrentContextValues(request,
+
+            target,
+
+            options=(),
+
+            channel_credentials=None,
+
+            call_credentials=None,
+
+            insecure=False,
+
+            compression=None,
+
+            wait_for_ready=None,
+
+            timeout=None,
+
+            metadata=None):
+
+        return grpc.experimental.unary_stream(request, target, '/ficus.GrpcKafkaService/GetCurrentContextValues',
+
+            kafka__service__pb2.GrpcGetCurrentContextValuesRequest.SerializeToString,
+
+            backend__service__pb2.GrpcPipelinePartExecutionResult.FromString,
+
+            options, channel_credentials,
+
+            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+
+
+
     @staticmethod
 
     def AddPipelineToSubscription(request,

From 15a694f70fd6b9b89ce7239e82858a1dd40f8390 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Tue, 5 May 2026 20:17:07 +0300
Subject: [PATCH 36/53] Fix go balancer compilation

---
 Ficus/src/go/balancer/executor/executor.go    | 33 +++++++++--
 .../go/balancer/services/backendservice.go    | 56 +------------------
 .../balancer/services/contextvaluesservice.go | 42 +++++++++++++-
 .../pipelineexecution_test.go                 | 23 +++++---
 4 files changed, 85 insertions(+), 69 deletions(-)

diff --git a/Ficus/src/go/balancer/executor/executor.go b/Ficus/src/go/balancer/executor/executor.go
index 89c9e7ccb..6e5e04b1b 100644
--- a/Ficus/src/go/balancer/executor/executor.go
+++ b/Ficus/src/go/balancer/executor/executor.go
@@ -14,11 +14,14 @@ import (
 	"github.com/google/uuid"
 	cmap "github.com/orcaman/concurrent-map/v2"
 	"go.uber.org/zap"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 type PipelineExecutor interface {
 	GetContextValues(executionId uuid.UUID) (map[string]uuid.UUID, bool)
 	DropExecutionResult(id uuid.UUID)
+	GetExecutionContextValues(id *grpcmodels.GrpcGuid) result.Result[map[string]uuid.UUID]
 
 	Execute(
 		plan *plan.ExecutionPlan,
@@ -296,12 +299,34 @@ func (this *pipelineExecutor) executePipelineParts(
 				outputChannel <- execResult
 			}
 
-			newContextValues, err := client.GetAllContextValues(context.Background(), execId)
-			if err != nil {
-				return result.Err[grpcmodels.GrpcGetAllContextValuesResult](err)
+			newCvRes := grpcmodels.ExecuteWithContextValuesClient[grpcmodels.GrpcGetAllContextValuesResult](
+				backend,
+				func(client grpcmodels.GrpcContextValuesServiceClient) result.Result[grpcmodels.GrpcGetAllContextValuesResult] {
+					return result.From(client.GetAllContextValuesIds(context.Background(), execId))
+				},
+			)
+
+			if newCvRes.IsErr() {
+				return result.Err[grpcmodels.GrpcGetAllContextValuesResult](newCvRes.Err())
 			}
 
-			return result.Ok(newContextValues)
+			return result.Ok(newCvRes.Ok())
 		},
 	)
 }
+
+func (this *pipelineExecutor) GetExecutionContextValues(id *grpcmodels.GrpcGuid) result.Result[map[string]uuid.UUID] {
+	executionId, err := uuid.Parse(id.Guid)
+	if err != nil {
+		err := status.Errorf(codes.InvalidArgument, "failed to parse uuid %s", id.Guid)
+		return result.Err[map[string]uuid.UUID](err)
+	}
+
+	executionContextValues, ok := this.GetContextValues(executionId)
+	if !ok {
+		err := status.Errorf(codes.NotFound, "context values for execution id %s are not found", executionId)
+		return result.Err[map[string]uuid.UUID](err)
+	}
+
+	return result.Ok(&executionContextValues)
+}
diff --git a/Ficus/src/go/balancer/services/backendservice.go b/Ficus/src/go/balancer/services/backendservice.go
index 766f79ed5..d766bdb5b 100644
--- a/Ficus/src/go/balancer/services/backendservice.go
+++ b/Ficus/src/go/balancer/services/backendservice.go
@@ -94,9 +94,9 @@ func (this *BackendServiceServer) ExecutePipeline(
 		err := server.Send(pipelineExecutionResult)
 		if err != nil {
 			return status.Errorf(codes.Internal, "error happened during sending pipeline part result: %s", err.Error())
-		} else {
-			logger.Infow("Sent a pipeline execution result")
 		}
+
+		logger.Infow("Sent a pipeline execution result")
 	}
 
 	executionResult := <-errorChannel
@@ -109,40 +109,6 @@ func (this *BackendServiceServer) ExecutePipeline(
 	return nil
 }
 
-func (this *BackendServiceServer) GetContextValue(
-	_ context.Context,
-	request *grpcmodels.GrpcGetContextValueRequest,
-) (*grpcmodels.GrpcGuid, error) {
-	executionContextValues := this.getExecutionContextValues(request.ExecutionId)
-	if executionContextValues.IsErr() {
-		return nil, executionContextValues.Err()
-	}
-
-	id, ok := (*executionContextValues.Ok())[request.Key.Name]
-	if !ok {
-		msg := "context value for execution id %s and context value key %s are not found"
-		return nil, status.Errorf(codes.NotFound, msg, request.ExecutionId.Guid, request.Key.Name)
-	}
-
-	return &grpcmodels.GrpcGuid{Guid: id.String()}, nil
-}
-
-func (this *BackendServiceServer) getExecutionContextValues(id *grpcmodels.GrpcGuid) result.Result[map[string]uuid.UUID] {
-	executionId, err := uuid.Parse(id.Guid)
-	if err != nil {
-		err := status.Errorf(codes.InvalidArgument, "failed to parse uuid %s", id.Guid)
-		return result.Err[map[string]uuid.UUID](err)
-	}
-
-	executionContextValues, ok := this.executor.GetContextValues(executionId)
-	if !ok {
-		err := status.Errorf(codes.NotFound, "context values for execution id %s are not found", executionId)
-		return result.Err[map[string]uuid.UUID](err)
-	}
-
-	return result.Ok(&executionContextValues)
-}
-
 func (this *BackendServiceServer) DropExecutionResult(context context.Context, id *grpcmodels.GrpcGuid) (*emptypb.Empty, error) {
 	executionId, err := uuid.Parse(id.Guid)
 	if err != nil {
@@ -164,21 +130,3 @@ func (this *BackendServiceServer) GetBackendInfo(context.Context, *emptypb.Empty
 
 	return &grpcmodels.GrpcFicusBackendInfo{Name: "GO_BALANCER", PipelineParts: pipelineParts}, nil
 }
-
-func (this *BackendServiceServer) GetAllContextValues(
-	_ context.Context,
-	id *grpcmodels.GrpcGuid,
-) (*grpcmodels.GrpcGetAllContextValuesResult, error) {
-	executionContextValues := this.getExecutionContextValues(id)
-	if executionContextValues.IsErr() {
-		return nil, executionContextValues.Err()
-	}
-
-	var ids []*grpcmodels.GrpcGuid
-
-	for _, id := range *executionContextValues.Ok() {
-		ids = append(ids, &grpcmodels.GrpcGuid{Guid: id.String()})
-	}
-
-	return &grpcmodels.GrpcGetAllContextValuesResult{ContextValues: ids}, nil
-}
diff --git a/Ficus/src/go/balancer/services/contextvaluesservice.go b/Ficus/src/go/balancer/services/contextvaluesservice.go
index aa37b0773..b6bb133f9 100644
--- a/Ficus/src/go/balancer/services/contextvaluesservice.go
+++ b/Ficus/src/go/balancer/services/contextvaluesservice.go
@@ -2,6 +2,7 @@ package services
 
 import (
 	"balancer/contextvalues"
+	"balancer/executor"
 	"balancer/utils"
 	"context"
 	"grpcmodels"
@@ -15,8 +16,9 @@ import (
 )
 
 type ContextValuesServiceServer struct {
-	storage contextvalues.Storage
-	logger  *zap.SugaredLogger
+	storage  contextvalues.Storage
+	executor executor.PipelineExecutor
+	logger   *zap.SugaredLogger
 	grpcmodels.UnsafeGrpcContextValuesServiceServer
 }
 
@@ -84,3 +86,39 @@ func (this *ContextValuesServiceServer) GetContextValue(
 
 	return nil
 }
+
+func (this *ContextValuesServiceServer) GetAllContextValuesIds(
+	_ context.Context,
+	id *grpcmodels.GrpcGuid,
+) (*grpcmodels.GrpcGetAllContextValuesResult, error) {
+	executionContextValues := this.executor.GetExecutionContextValues(id)
+	if executionContextValues.IsErr() {
+		return nil, executionContextValues.Err()
+	}
+
+	var ids []*grpcmodels.GrpcGuid
+
+	for _, id := range *executionContextValues.Ok() {
+		ids = append(ids, &grpcmodels.GrpcGuid{Guid: id.String()})
+	}
+
+	return &grpcmodels.GrpcGetAllContextValuesResult{ContextValues: ids}, nil
+}
+
+func (this *ContextValuesServiceServer) GetContextValueId(
+	_ context.Context,
+	request *grpcmodels.GrpcGetContextValueRequest,
+) (*grpcmodels.GrpcGuid, error) {
+	executionContextValues := this.executor.GetExecutionContextValues(request.ExecutionId)
+	if executionContextValues.IsErr() {
+		return nil, executionContextValues.Err()
+	}
+
+	id, ok := (*executionContextValues.Ok())[request.Key.Name]
+	if !ok {
+		msg := "context value for execution id %s and context value key %s are not found"
+		return nil, status.Errorf(codes.NotFound, msg, request.ExecutionId.Guid, request.Key.Name)
+	}
+
+	return &grpcmodels.GrpcGuid{Guid: id.String()}, nil
+}
diff --git a/Ficus/src/go/integrationtests/pipelineexecution_test.go b/Ficus/src/go/integrationtests/pipelineexecution_test.go
index 3ca0fea8c..1496bbb73 100644
--- a/Ficus/src/go/integrationtests/pipelineexecution_test.go
+++ b/Ficus/src/go/integrationtests/pipelineexecution_test.go
@@ -197,18 +197,23 @@ func executePipeline(t *testing.T, balancerBackend string, cvId *grpcmodels.Grpc
 
 			snaps.MatchSnapshot(t, string(jsonResults))
 
-			executionId := lastResult.GetFinalResult().GetSuccess()
-			cvIds, err := client.GetAllContextValues(context.Background(), executionId)
-			assert.Nil(t, err)
-			assert.Len(t, cvIds.ContextValues, 2)
+			return grpcmodels.ExecuteWithContextValuesClient(
+				balancerBackend,
+				func(cvClient grpcmodels.GrpcContextValuesServiceClient) result.Result[void.Void] {
+					executionId := lastResult.GetFinalResult().GetSuccess()
+					cvIds, err := cvClient.GetAllContextValuesIds(context.Background(), executionId)
+					assert.Nil(t, err)
+					assert.Len(t, cvIds.ContextValues, 2)
 
-			_, err = client.DropExecutionResult(context.Background(), executionId)
-			assert.Nil(t, err)
+					_, err = client.DropExecutionResult(context.Background(), executionId)
+					assert.Nil(t, err)
 
-			cvIds, err = client.GetAllContextValues(context.Background(), executionId)
-			assert.NotNil(t, err)
+					cvIds, err = cvClient.GetAllContextValuesIds(context.Background(), executionId)
+					assert.NotNil(t, err)
 
-			return result.Ok(void.Instance)
+					return result.Ok(void.Instance)
+				},
+			)
 		},
 	)
 }

From cf608aae8f9461fc34ac6af7336ecbdecc12ea5f Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Tue, 5 May 2026 20:30:31 +0300
Subject: [PATCH 37/53] Fix DI issues

---
 Ficus/src/go/balancer/services/contextvaluesservice.go | 4 ++--
 Ficus/src/go/balancer/wire_gen.go                      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Ficus/src/go/balancer/services/contextvaluesservice.go b/Ficus/src/go/balancer/services/contextvaluesservice.go
index b6bb133f9..5aeb46620 100644
--- a/Ficus/src/go/balancer/services/contextvaluesservice.go
+++ b/Ficus/src/go/balancer/services/contextvaluesservice.go
@@ -22,8 +22,8 @@ type ContextValuesServiceServer struct {
 	grpcmodels.UnsafeGrpcContextValuesServiceServer
 }
 
-func NewContextValuesServiceServer(storage contextvalues.Storage, logger *zap.SugaredLogger) *ContextValuesServiceServer {
-	return &ContextValuesServiceServer{storage: storage, logger: logger}
+func NewContextValuesServiceServer(storage contextvalues.Storage, executor executor.PipelineExecutor, logger *zap.SugaredLogger) *ContextValuesServiceServer {
+	return &ContextValuesServiceServer{storage: storage, executor: executor, logger: logger}
 }
 
 func (this *ContextValuesServiceServer) SetContextValue(
diff --git a/Ficus/src/go/balancer/wire_gen.go b/Ficus/src/go/balancer/wire_gen.go
index de0649a88..0a6b12bc4 100644
--- a/Ficus/src/go/balancer/wire_gen.go
+++ b/Ficus/src/go/balancer/wire_gen.go
@@ -25,7 +25,7 @@ func BuildContainer() *Container {
 	pipelineExecutor := executor.NewPipelineExecutor(backendsInfo, storage)
 	executionPlanner := plan.NewExecutionPlanner(backendsInfo)
 	backendServiceServer := services.NewBackendServiceServer(backendsInfo, pipelineExecutor, executionPlanner, sugaredLogger)
-	contextValuesServiceServer := services.NewContextValuesServiceServer(storage, sugaredLogger)
+	contextValuesServiceServer := services.NewContextValuesServiceServer(storage, pipelineExecutor, sugaredLogger)
 	balancerServiceServer := services.NewBalancerServiceServer(backendsInfo)
 	container := NewContainer(backendServiceServer, contextValuesServiceServer, balancerServiceServer, sugaredLogger)
 	return container

From a03998e4c803d4429f7eb7e6a15e2034db93969e Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Tue, 5 May 2026 20:59:12 +0300
Subject: [PATCH 38/53] Specify concrete windows version

---
 .github/workflows/tests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 9cb4e4799..4ba593e40 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -9,7 +9,7 @@ on:
 
 jobs:
   dotnet-bxes-unit-tests:
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     steps:
       - uses: actions/checkout@v4
@@ -25,7 +25,7 @@ jobs:
         run: dotnet test ./bxes/src/csharp/Bxes.Tests
 
   rust-bxes-unit-tests:
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     steps:
       - uses: actions/checkout@v4
@@ -37,7 +37,7 @@ jobs:
           RUSTFLAGS: ""
 
   dotnet-procfiler-unit-tests:
-    runs-on: windows-latest
+    runs-on: windows-2022
 
     steps:
       - uses: actions/checkout@v4

From c917e2401d903216e9b3697a154f4146320acb6a Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Wed, 6 May 2026 12:55:11 +0300
Subject: [PATCH 39/53] Set some context values before pipeline execution

---
 .../src/grpc/kafka/kafka_service.rs           | 55 ++++++++++++-------
 .../ficus_backend/src/grpc/kafka/models.rs    | 19 +++++++
 .../src/grpc/kafka/streaming/processors.rs    | 39 +++----------
 .../src/grpc/kafka/streaming/t1/processors.rs | 37 ++++++++-----
 .../kafka/streaming/t2/dfg_data_structures.rs |  2 +-
 5 files changed, 86 insertions(+), 66 deletions(-)

diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
index a89aaf7ba..e678c83dc 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
@@ -25,7 +25,11 @@ use crate::{
 };
 use bxes_kafka::consumer::bxes_kafka_consumer::{BxesKafkaConsumer, BxesKafkaError, BxesKafkaTrace};
 use ficus::features::cases::CaseName;
+use ficus::pipelines::keys::context_keys::{
+  PIPELINE_ID_KEY, PIPELINE_NAME_KEY, PROCESS_NAME_KEY, SUBSCRIPTION_ID_KEY, SUBSCRIPTION_NAME_KEY, UNSTRUCTURED_METADATA_KEY,
+};
 use ficus::pipelines::{context::LogMessageHandler, pipeline_parts::PipelineParts};
+use ficus::utils::user_data::user_data::UserData;
 use log::{debug, error, warn};
 use rdkafka::{ClientConfig, error::KafkaError};
 use std::{
@@ -228,27 +232,30 @@ impl KafkaService {
 
       let trace_processing_context = KafkaTraceProcessingContext { execution_dto, trace };
 
-      if let Err(err) = pipeline.processor.observe(trace_processing_context) {
-        let message = format!("Failed to get update result, err: {}", err);
-        dto.logger.handle(message.as_str()).expect("Must log message");
-      } else {
-        let metadata = ProcessCaseMetadata {
-          pipeline_id: Some(*pipeline_id),
-          pipeline_name: Some(pipeline.name.clone().into()),
-          subscription_name: Some(dto.name.as_ref().into()),
-          subscription_id: Some(dto.uuid),
-          process_name: metadata.process.process_name,
-          metadata: metadata.unstructured_metadata,
-          case_name: CaseName {
-            display_name: metadata.case.case_display_name,
-            name_parts: metadata.case.case_name_parts,
-          },
-        };
-
-        pipeline
-          .execution_dto
-          .events_handler
-          .handle(&PipelineEvent::ProcessCaseMetadata(metadata));
+      match pipeline.processor.observe(trace_processing_context) {
+        Ok(..) => {
+          let metadata = ProcessCaseMetadata {
+            pipeline_id: Some(*pipeline_id),
+            pipeline_name: Some(pipeline.name.clone().into()),
+            subscription_name: Some(dto.name.as_ref().into()),
+            subscription_id: Some(dto.uuid),
+            process_name: metadata.process.process_name,
+            metadata: metadata.unstructured_metadata,
+            case_name: CaseName {
+              display_name: metadata.case.case_display_name,
+              name_parts: metadata.case.case_name_parts,
+            },
+          };
+
+          pipeline
+            .execution_dto
+            .events_handler
+            .handle(&PipelineEvent::ProcessCaseMetadata(metadata));
+        }
+        Err(err) => {
+          let message = format!("Failed to get update result, err: {}", err);
+          dto.logger.handle(&message).expect("Must log message");
+        }
       };
     }
   }
@@ -280,6 +287,12 @@ impl KafkaService {
     let result = context.execute_grpc_pipeline_and_fill_context_values(
       |context| {
         pipeline.processor.fill_pipeline_context(context, case_name);
+
+        context.put_concrete(SUBSCRIPTION_ID_KEY.key(), sub_id);
+        context.put_concrete(PIPELINE_ID_KEY.key(), pipeline_id);
+        context.put_concrete(SUBSCRIPTION_NAME_KEY.key(), kafka_subscription.name.as_ref().into());
+        context.put_concrete(PIPELINE_NAME_KEY.key(), pipeline.name.clone().into());
+
         Ok(())
       },
       self.cv_service.clone(),
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
index 852b8a8ac..466c3cc81 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
@@ -2,6 +2,10 @@ use crate::grpc::{
   events::events_handler::PipelineEventsHandler, kafka::kafka_service::KafkaSubscription, logs_handler::ConsoleLogMessageHandler,
 };
 use bxes::models::domain::bxes_value::BxesValue;
+use ficus::features::cases::CaseName;
+use ficus::pipelines::context::PipelineContext;
+use ficus::pipelines::keys::context_keys::{CASE_NAME_KEY, PROCESS_NAME_KEY, UNSTRUCTURED_METADATA_KEY};
+use ficus::utils::user_data::user_data::UserData;
 use ficus::{
   event_log::bxes::bxes_to_xes_converter::BxesToXesReadError,
   pipelines::{errors::pipeline_errors::PipelinePartExecutionError, pipeline_parts::PipelineParts},
@@ -101,6 +105,9 @@ pub(super) struct ExtractedTraceMetadata {
   pub unstructured_metadata: Vec<(Rc<str>, Rc<str>)>,
 }
 
+unsafe impl Send for ExtractedTraceMetadata {}
+unsafe impl Sync for ExtractedTraceMetadata {}
+
 impl ExtractedTraceMetadata {
   pub fn create_from(metadata: &HashMap<Rc<str>, Rc<BxesValue>>) -> Result<Self, XesFromBxesKafkaTraceCreatingError> {
     Ok(ExtractedTraceMetadata {
@@ -109,6 +116,18 @@ impl ExtractedTraceMetadata {
       unstructured_metadata: metadata_to_string_string_pairs(metadata),
     })
   }
+
+  pub fn write_to_context(&self, context: &mut PipelineContext) {
+    context.put_concrete(PROCESS_NAME_KEY.key(), self.process.process_name.clone());
+    context.put_concrete(UNSTRUCTURED_METADATA_KEY.key(), self.unstructured_metadata.clone());
+    context.put_concrete(
+      CASE_NAME_KEY.key(),
+      CaseName {
+        display_name: self.case.case_display_name.clone(),
+        name_parts: self.case.case_name_parts.clone(),
+      },
+    );
+  }
 }
 
 pub(super) struct ProcessMetadata {
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs
index 223af2c01..241835ddc 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs
@@ -1,19 +1,11 @@
 use crate::grpc::kafka::models::ExtractedTraceMetadata;
 use crate::grpc::kafka::{
-  models::{KafkaTraceProcessingError, PipelineExecutionDto, XesFromBxesKafkaTraceCreatingError},
+  models::{KafkaTraceProcessingError, PipelineExecutionDto},
   streaming::{t1::processors::T1StreamingProcessor, t2::processors::T2StreamingProcessor},
 };
-use bxes::models::domain::bxes_value::BxesValue;
 use bxes_kafka::consumer::bxes_kafka_consumer::BxesKafkaTrace;
-use ficus::{
-  features::cases::CaseName,
-  pipelines::{
-    context::PipelineContext,
-    keys::context_keys::{CASE_NAME_KEY, PROCESS_NAME_KEY, UNSTRUCTURED_METADATA_KEY},
-  },
-  utils::user_data::user_data::UserData,
-};
-use std::{collections::HashMap, rc::Rc};
+use ficus::pipelines::context::PipelineContext;
+use std::sync::Arc;
 
 #[derive(Clone)]
 pub enum TracesProcessor {
@@ -21,6 +13,12 @@ pub enum TracesProcessor {
   T2(T2StreamingProcessor),
 }
 
+#[derive(Clone)]
+pub(super) struct ProcessorState<TData> {
+  pub data: TData,
+  pub metadata: Arc<ExtractedTraceMetadata>,
+}
+
 pub struct KafkaTraceProcessingContext {
   pub trace: BxesKafkaTrace,
   pub execution_dto: PipelineExecutionDto,
@@ -41,22 +39,3 @@ impl TracesProcessor {
     }
   }
 }
-
-fn add_system_metadata(
-  metadata: &HashMap<Rc<str>, Rc<BxesValue>>,
-  context: &mut PipelineContext,
-) -> Result<(), XesFromBxesKafkaTraceCreatingError> {
-  let metadata = ExtractedTraceMetadata::create_from(metadata)?;
-
-  context.put_concrete(PROCESS_NAME_KEY.key(), metadata.process.process_name);
-  context.put_concrete(UNSTRUCTURED_METADATA_KEY.key(), metadata.unstructured_metadata);
-  context.put_concrete(
-    CASE_NAME_KEY.key(),
-    CaseName {
-      display_name: metadata.case.case_display_name,
-      name_parts: metadata.case.case_name_parts,
-    },
-  );
-
-  Ok(())
-}
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
index 9bc6b2005..e635f7af4 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
@@ -1,4 +1,5 @@
-use crate::grpc::kafka::models::{string_value_or_err, uuid_or_err};
+use crate::grpc::kafka::models::{ExtractedTraceMetadata, string_value_or_err, uuid_or_err};
+use crate::grpc::kafka::streaming::processors::ProcessorState;
 use crate::grpc::{
   kafka::models::{KAFKA_CASE_ID, KAFKA_CASE_NAME_PARTS, KAFKA_TRACE_ID, KafkaTraceProcessingError, XesFromBxesKafkaTraceCreatingError},
   logs_handler::ConsoleLogMessageHandler,
@@ -27,7 +28,7 @@ use uuid::Uuid;
 #[derive(Clone)]
 pub struct T1StreamingProcessor {
   logger: ConsoleLogMessageHandler,
-  names_to_logs: Arc<Mutex<HashMap<String, XesEventLogImpl>>>,
+  names_to_processed_data: Arc<Mutex<HashMap<String, ProcessorState<XesEventLogImpl>>>>,
   filterer: T1LogFilterer,
 }
 
@@ -35,7 +36,7 @@ impl T1StreamingProcessor {
   pub fn new(filterer: T1LogFilterer) -> Self {
     Self {
       logger: ConsoleLogMessageHandler::new(),
-      names_to_logs: Arc::new(Mutex::new(HashMap::new())),
+      names_to_processed_data: Arc::new(Mutex::new(HashMap::new())),
       filterer,
     }
   }
@@ -52,10 +53,12 @@ impl T1StreamingProcessor {
   }
 
   pub fn fill_pipeline_context(&self, context: &mut PipelineContext, case_name: &str) {
-    let names_to_log = self.names_to_logs.lock().unwrap();
+    let names_to_processed_data = self.names_to_processed_data.lock().unwrap();
+
+    if let Some(data) = names_to_processed_data.get(case_name).cloned() {
+      context.put_concrete(EVENT_LOG_KEY.key(), data.data);
+      data.metadata.write_to_context(context);
 
-    if let Some(log) = names_to_log.get(case_name).cloned() {
-      context.put_concrete(EVENT_LOG_KEY.key(), log);
       info!("Filled event log for case {case_name:?}");
     } else {
       warn!("Failed to find log for case {case_name:?}");
@@ -77,27 +80,33 @@ impl T1StreamingProcessor {
     trace_id: Uuid,
     case_key: &str,
   ) -> Result<(), XesFromBxesKafkaTraceCreatingError> {
-    let mut names_to_logs = self.names_to_logs.lock();
-    let names_to_logs = match names_to_logs.as_mut() {
+    let mut names_to_processed_data = self.names_to_processed_data.lock();
+    let names_to_processed_data = match names_to_processed_data.as_mut() {
       Ok(names_to_logs) => names_to_logs,
       Err(_) => panic!("Failed to acquire a names_to_logs map from mutex"),
     };
 
-    if !names_to_logs.contains_key(case_key) {
+    if !names_to_processed_data.contains_key(case_key) {
       let new_log = XesEventLogImpl::default();
-      names_to_logs.insert(case_key.to_owned(), new_log);
+      names_to_processed_data.insert(
+        case_key.to_owned(),
+        ProcessorState {
+          data: new_log,
+          metadata: Arc::new(ExtractedTraceMetadata::create_from(trace.metadata())?),
+        },
+      );
     }
 
-    let existing_log = names_to_logs.get_mut(case_key).expect("Log should be present");
+    let existing_data = names_to_processed_data.get_mut(case_key).expect("Log should be present");
 
-    self.filterer.filter(existing_log);
+    self.filterer.filter(&mut existing_data.data);
 
     let mut read_xes_trace = match read_bxes_events(trace.events()) {
       Ok(xes_trace) => xes_trace,
       Err(err) => return Err(XesFromBxesKafkaTraceCreatingError::BxesToXexConversionError(err)),
     };
 
-    for existing_xes_trace in existing_log.traces() {
+    for existing_xes_trace in existing_data.data.traces() {
       let mut existing_xes_trace = existing_xes_trace.borrow_mut();
       if let Some(EventPayloadValue::Guid(id)) = existing_xes_trace.metadata().get(KAFKA_TRACE_ID).cloned() {
         if id == trace_id {
@@ -118,7 +127,7 @@ impl T1StreamingProcessor {
       .insert(KAFKA_TRACE_ID.to_owned(), EventPayloadValue::Guid(trace_id));
 
     let read_xes_trace = Rc::new(RefCell::new(read_xes_trace));
-    existing_log.push(read_xes_trace);
+    existing_data.data.push(read_xes_trace);
 
     info!("Created new trace for trace id {}", trace_id);
 
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
index 92adf9ee4..be49584ee 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
@@ -126,7 +126,7 @@ impl DfgDataStructureBase {
 }
 
 #[derive(Clone)]
-pub(in crate::grpc::kafka::streaming::t2) struct DfgDataStructures {
+pub(super) struct DfgDataStructures {
   base: DfgDataStructureBase,
 }
 

From 418298daf6ba856df917be9f675b0e0e81408b0c Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Wed, 6 May 2026 13:14:04 +0300
Subject: [PATCH 40/53] Rc<str> -> Arc<str>

---
 .../bxes/src/models/domain/bxes_artifact.rs   | 12 ++++----
 .../bxes/src/models/domain/bxes_driver.rs     | 10 +++----
 .../bxes/src/models/domain/bxes_event_log.rs  |  8 ++---
 .../src/models/domain/bxes_log_metadata.rs    | 17 +++++------
 .../rust/bxes/src/models/domain/bxes_value.rs |  4 +--
 bxes/src/rust/bxes/src/models/domain/utils.rs | 13 ++++----
 .../src/rust/bxes/src/models/system_models.rs |  6 ++--
 .../src/read/multiple_files_bxes_reader.rs    |  2 +-
 bxes/src/rust/bxes/src/read/read_context.rs   |  4 +--
 bxes/src/rust/bxes/src/read/read_utils.rs     | 21 ++++++-------
 .../bxes/src/read/single_file_bxes_reader.rs  |  2 +-
 bxes/src/rust/bxes/src/writer/errors.rs       |  8 ++---
 .../src/rust/bxes/src/writer/write_context.rs |  6 ++--
 bxes/src/rust/bxes/src/writer/writer_utils.rs | 22 +++++++-------
 .../rust/bxes/tests/test_core/random_log.rs   | 30 +++++++++----------
 .../src/consumer/bxes_kafka_consumer.rs       |  7 +++--
 16 files changed, 85 insertions(+), 87 deletions(-)

diff --git a/bxes/src/rust/bxes/src/models/domain/bxes_artifact.rs b/bxes/src/rust/bxes/src/models/domain/bxes_artifact.rs
index a3b3d7297..d6dab5203 100644
--- a/bxes/src/rust/bxes/src/models/domain/bxes_artifact.rs
+++ b/bxes/src/rust/bxes/src/models/domain/bxes_artifact.rs
@@ -1,8 +1,6 @@
 use crate::models::domain::bxes_value::BxesValue;
-use std::{
-  hash::{Hash, Hasher},
-  rc::Rc,
-};
+use std::sync::Arc;
+use std::hash::{Hash, Hasher};
 
 #[derive(Debug, Clone)]
 pub struct BxesArtifact {
@@ -35,9 +33,9 @@ impl PartialEq for BxesArtifact {
 
 #[derive(Clone, Debug)]
 pub struct BxesArtifactItem {
-  pub model: Rc<BxesValue>,
-  pub instance: Rc<BxesValue>,
-  pub transition: Rc<BxesValue>,
+  pub model: Arc<BxesValue>,
+  pub instance: Arc<BxesValue>,
+  pub transition: Arc<BxesValue>,
 }
 
 impl Hash for BxesArtifactItem {
diff --git a/bxes/src/rust/bxes/src/models/domain/bxes_driver.rs b/bxes/src/rust/bxes/src/models/domain/bxes_driver.rs
index 824ff5e58..f4a87d3ff 100644
--- a/bxes/src/rust/bxes/src/models/domain/bxes_driver.rs
+++ b/bxes/src/rust/bxes/src/models/domain/bxes_driver.rs
@@ -1,8 +1,6 @@
 use crate::models::domain::bxes_value::BxesValue;
-use std::{
-  hash::{Hash, Hasher},
-  rc::Rc,
-};
+use std::sync::Arc;
+use std::hash::{Hash, Hasher};
 
 #[derive(Debug, Clone)]
 pub struct BxesDrivers {
@@ -36,8 +34,8 @@ impl PartialEq for BxesDrivers {
 #[derive(Clone, Debug)]
 pub struct BxesDriver {
   pub amount: BxesValue,
-  pub name: Rc<BxesValue>,
-  pub driver_type: Rc<BxesValue>,
+  pub name: Arc<BxesValue>,
+  pub driver_type: Arc<BxesValue>,
 }
 
 impl BxesDriver {
diff --git a/bxes/src/rust/bxes/src/models/domain/bxes_event_log.rs b/bxes/src/rust/bxes/src/models/domain/bxes_event_log.rs
index 6882912f7..5670e9f7a 100644
--- a/bxes/src/rust/bxes/src/models/domain/bxes_event_log.rs
+++ b/bxes/src/rust/bxes/src/models/domain/bxes_event_log.rs
@@ -1,5 +1,5 @@
 use crate::models::domain::{bxes_log_metadata::BxesEventLogMetadata, bxes_value::BxesValue, utils::compare_list_of_attributes};
-use std::rc::Rc;
+use std::sync::Arc;
 
 #[derive(Debug)]
 pub struct BxesEventLog {
@@ -31,7 +31,7 @@ impl PartialEq for BxesEventLog {
 #[derive(Debug)]
 pub struct BxesTraceVariant {
   pub traces_count: u32,
-  pub metadata: Vec<(Rc<BxesValue>, Rc<BxesValue>)>,
+  pub metadata: Vec<(Arc<BxesValue>, Arc<BxesValue>)>,
   pub events: Vec<BxesEvent>,
 }
 
@@ -57,9 +57,9 @@ impl PartialEq for BxesTraceVariant {
 
 #[derive(Debug, Clone)]
 pub struct BxesEvent {
-  pub name: Rc<BxesValue>,
+  pub name: Arc<BxesValue>,
   pub timestamp: i64,
-  pub attributes: Option<Vec<(Rc<BxesValue>, Rc<BxesValue>)>>,
+  pub attributes: Option<Vec<(Arc<BxesValue>, Arc<BxesValue>)>>,
 }
 
 impl PartialEq for BxesEvent {
diff --git a/bxes/src/rust/bxes/src/models/domain/bxes_log_metadata.rs b/bxes/src/rust/bxes/src/models/domain/bxes_log_metadata.rs
index 25a3e0f1e..640491bb8 100644
--- a/bxes/src/rust/bxes/src/models/domain/bxes_log_metadata.rs
+++ b/bxes/src/rust/bxes/src/models/domain/bxes_log_metadata.rs
@@ -1,5 +1,4 @@
-use std::rc::Rc;
-
+use std::sync::Arc;
 use num_derive::{FromPrimitive, ToPrimitive};
 use variant_count::VariantCount;
 
@@ -9,21 +8,21 @@ use crate::models::domain::bxes_value::BxesValue;
 pub struct BxesEventLogMetadata {
   pub extensions: Option<Vec<BxesExtension>>,
   pub classifiers: Option<Vec<BxesClassifier>>,
-  pub properties: Option<Vec<(Rc<BxesValue>, Rc<BxesValue>)>>,
+  pub properties: Option<Vec<(Arc<BxesValue>, Arc<BxesValue>)>>,
   pub globals: Option<Vec<BxesGlobal>>,
 }
 
 #[derive(Debug, PartialEq, Eq)]
 pub struct BxesExtension {
-  pub name: Rc<BxesValue>,
-  pub prefix: Rc<BxesValue>,
-  pub uri: Rc<BxesValue>,
+  pub name: Arc<BxesValue>,
+  pub prefix: Arc<BxesValue>,
+  pub uri: Arc<BxesValue>,
 }
 
 #[derive(Debug, PartialEq, Eq)]
 pub struct BxesClassifier {
-  pub name: Rc<BxesValue>,
-  pub keys: Vec<Rc<BxesValue>>,
+  pub name: Arc<BxesValue>,
+  pub keys: Vec<Arc<BxesValue>>,
 }
 
 #[derive(Debug, FromPrimitive, ToPrimitive, VariantCount, PartialEq, Eq)]
@@ -36,5 +35,5 @@ pub enum BxesGlobalKind {
 #[derive(Debug, PartialEq, Eq)]
 pub struct BxesGlobal {
   pub entity_kind: BxesGlobalKind,
-  pub globals: Vec<(Rc<BxesValue>, Rc<BxesValue>)>,
+  pub globals: Vec<(Arc<BxesValue>, Arc<BxesValue>)>,
 }
diff --git a/bxes/src/rust/bxes/src/models/domain/bxes_value.rs b/bxes/src/rust/bxes/src/models/domain/bxes_value.rs
index c97868d8a..609133997 100644
--- a/bxes/src/rust/bxes/src/models/domain/bxes_value.rs
+++ b/bxes/src/rust/bxes/src/models/domain/bxes_value.rs
@@ -6,8 +6,8 @@ use crate::models::domain::{
 };
 use std::{
   hash::{Hash, Hasher},
-  rc::Rc,
 };
+use std::sync::Arc;
 
 #[derive(Clone, Debug)]
 pub enum BxesValue {
@@ -18,7 +18,7 @@ pub enum BxesValue {
   Uint64(u64),
   Float32(f32),
   Float64(f64),
-  String(Rc<str>),
+  String(Arc<str>),
   Bool(bool),
   Timestamp(i64),
   BrafLifecycle(BrafLifecycle),
diff --git a/bxes/src/rust/bxes/src/models/domain/utils.rs b/bxes/src/rust/bxes/src/models/domain/utils.rs
index c53e3c22d..64f9bf7d9 100644
--- a/bxes/src/rust/bxes/src/models/domain/utils.rs
+++ b/bxes/src/rust/bxes/src/models/domain/utils.rs
@@ -1,9 +1,10 @@
 use crate::models::domain::bxes_value::BxesValue;
-use std::{collections::HashSet, rc::Rc};
+use std::collections::HashSet;
+use std::sync::Arc;
 
 pub fn compare_list_of_attributes(
-  first_attributes: &Option<Vec<(Rc<BxesValue>, Rc<BxesValue>)>>,
-  second_attributes: &Option<Vec<(Rc<BxesValue>, Rc<BxesValue>)>>,
+  first_attributes: &Option<Vec<(Arc<BxesValue>, Arc<BxesValue>)>>,
+  second_attributes: &Option<Vec<(Arc<BxesValue>, Arc<BxesValue>)>>,
 ) -> bool {
   if first_attributes.is_none() && second_attributes.is_none() {
     return true;
@@ -16,9 +17,9 @@ pub fn compare_list_of_attributes(
       return false;
     }
 
-    let first_set = self_attributes.iter().collect::<HashSet<&(Rc<BxesValue>, Rc<BxesValue>)>>();
+    let first_set = self_attributes.iter().collect::<HashSet<&(Arc<BxesValue>, Arc<BxesValue>)>>();
 
-    let second_set = other_attributes.iter().collect::<HashSet<&(Rc<BxesValue>, Rc<BxesValue>)>>();
+    let second_set = other_attributes.iter().collect::<HashSet<&(Arc<BxesValue>, Arc<BxesValue>)>>();
 
     return first_set.eq(&second_set);
   }
@@ -26,6 +27,6 @@ pub fn compare_list_of_attributes(
   false
 }
 
-pub fn attributes_equals(first_attribute: &(Rc<BxesValue>, Rc<BxesValue>), second_attribute: &(Rc<BxesValue>, Rc<BxesValue>)) -> bool {
+pub fn attributes_equals(first_attribute: &(Arc<BxesValue>, Arc<BxesValue>), second_attribute: &(Arc<BxesValue>, Arc<BxesValue>)) -> bool {
   first_attribute.0.eq(&second_attribute.0) && first_attribute.1.eq(&second_attribute.1)
 }
diff --git a/bxes/src/rust/bxes/src/models/system_models.rs b/bxes/src/rust/bxes/src/models/system_models.rs
index 2d15c79ce..d86f3fb26 100644
--- a/bxes/src/rust/bxes/src/models/system_models.rs
+++ b/bxes/src/rust/bxes/src/models/system_models.rs
@@ -1,17 +1,17 @@
 use crate::models::domain::type_ids::TypeIds;
-use std::rc::Rc;
+use std::sync::Arc;
 
 #[derive(Debug, PartialEq, Eq, Hash, Clone)]
 pub struct ValueAttributeDescriptor {
   pub type_id: TypeIds,
-  pub name: Rc<str>,
+  pub name: Arc<str>,
 }
 
 impl ValueAttributeDescriptor {
   pub fn new(type_id: TypeIds, name: String) -> Self {
     Self {
       type_id,
-      name: Rc::from(name),
+      name: Arc::from(name),
     }
   }
 }
diff --git a/bxes/src/rust/bxes/src/read/multiple_files_bxes_reader.rs b/bxes/src/rust/bxes/src/read/multiple_files_bxes_reader.rs
index 8d49e6434..be23b7872 100644
--- a/bxes/src/rust/bxes/src/read/multiple_files_bxes_reader.rs
+++ b/bxes/src/rust/bxes/src/read/multiple_files_bxes_reader.rs
@@ -5,7 +5,7 @@ use crate::{
     bxes_event_log::{BxesEventLog, BxesTraceVariant},
     bxes_log_metadata::BxesEventLogMetadata,
   },
-  read::read_context::{ReadContext, ReadMetadata},
+  read::read_context::ReadContext,
   utils::buffered_stream::BufferedReadFileStream,
 };
 use std::path::Path;
diff --git a/bxes/src/rust/bxes/src/read/read_context.rs b/bxes/src/rust/bxes/src/read/read_context.rs
index 0a06e178d..179346c27 100644
--- a/bxes/src/rust/bxes/src/read/read_context.rs
+++ b/bxes/src/rust/bxes/src/read/read_context.rs
@@ -2,11 +2,11 @@ use crate::{
   binary_rw::core::BinaryReader,
   models::{domain::bxes_value::BxesValue, system_models::SystemMetadata},
 };
-use std::rc::Rc;
+use std::sync::Arc;
 
 #[derive(Default)]
 pub struct ReadMetadata {
-  pub values: Option<Vec<Rc<BxesValue>>>,
+  pub values: Option<Vec<Arc<BxesValue>>>,
   pub kv_pairs: Option<Vec<(u32, u32)>>,
   pub system_metadata: Option<SystemMetadata>,
 }
diff --git a/bxes/src/rust/bxes/src/read/read_utils.rs b/bxes/src/rust/bxes/src/read/read_utils.rs
index 4e8f54c1a..7f11b342d 100644
--- a/bxes/src/rust/bxes/src/read/read_utils.rs
+++ b/bxes/src/rust/bxes/src/read/read_utils.rs
@@ -1,4 +1,5 @@
 use num_traits::FromPrimitive;
+use std::sync::Arc;
 use std::{
   fs::File,
   io::{Cursor, Read, Seek},
@@ -165,7 +166,7 @@ pub fn try_read_leb128(reader: &mut BinaryReader) -> Result<u32, BxesReadError>
   }
 }
 
-pub fn string_or_err(value: &BxesValue) -> Result<Rc<str>, BxesReadError> {
+pub fn string_or_err(value: &BxesValue) -> Result<Arc<str>, BxesReadError> {
   if let BxesValue::String(string) = value {
     Ok(string.clone())
   } else {
@@ -205,7 +206,7 @@ pub fn try_read_trace_variant(context: &mut ReadContext) -> Result<BxesTraceVari
   })
 }
 
-pub fn try_read_trace_variant_metadata(context: &mut ReadContext) -> Result<Vec<(Rc<BxesValue>, Rc<BxesValue>)>, BxesReadError> {
+pub fn try_read_trace_variant_metadata(context: &mut ReadContext) -> Result<Vec<(Arc<BxesValue>, Arc<BxesValue>)>, BxesReadError> {
   let mut variant_metadata = vec![];
   let metadata_count = try_read_u32(context.reader.as_mut().unwrap())?;
   for _ in 0..metadata_count {
@@ -243,7 +244,7 @@ fn try_read_event(context: &mut ReadContext) -> Result<BxesEvent, BxesReadError>
   })
 }
 
-fn try_read_event_attributes(context: &mut ReadContext) -> Result<Option<Vec<(Rc<BxesValue>, Rc<BxesValue>)>>, BxesReadError> {
+fn try_read_event_attributes(context: &mut ReadContext) -> Result<Option<Vec<(Arc<BxesValue>, Arc<BxesValue>)>>, BxesReadError> {
   let mut attributes = None;
   let value_attrs_len = if let Some(attrs) = context.metadata.system_metadata.as_ref().unwrap().values_attrs.as_ref() {
     attrs.len()
@@ -259,7 +260,7 @@ fn try_read_event_attributes(context: &mut ReadContext) -> Result<Option<Vec<(Rc
       let descriptor = value_attrs.get(i).unwrap();
 
       let key = BxesValue::String(descriptor.name.clone());
-      let key = Rc::new(key);
+      let key = Arc::new(key);
 
       let value_type_id = get_type_id(&value);
       let null_type_id = TypeIds::Null;
@@ -269,7 +270,7 @@ fn try_read_event_attributes(context: &mut ReadContext) -> Result<Option<Vec<(Rc
           attributes = Some(vec![]);
         }
 
-        attributes.as_mut().unwrap().push((key, Rc::new(value)));
+        attributes.as_mut().unwrap().push((key, Arc::new(value)));
       }
     }
   }
@@ -282,7 +283,7 @@ fn try_read_event_attributes(context: &mut ReadContext) -> Result<Option<Vec<(Rc
 pub fn try_fill_attributes(
   context: &mut ReadContext,
   leb_128: bool,
-  attributes: &mut Option<Vec<(Rc<BxesValue>, Rc<BxesValue>)>>,
+  attributes: &mut Option<Vec<(Arc<BxesValue>, Arc<BxesValue>)>>,
 ) -> Result<(), BxesReadError> {
   let attributes_count = try_read_count(context, leb_128)?;
   if attributes_count > 0 && attributes.is_none() {
@@ -296,7 +297,7 @@ pub fn try_fill_attributes(
   Ok(())
 }
 
-fn try_read_attributes(context: &mut ReadContext, leb_128: bool) -> Result<Option<Vec<(Rc<BxesValue>, Rc<BxesValue>)>>, BxesReadError> {
+fn try_read_attributes(context: &mut ReadContext, leb_128: bool) -> Result<Option<Vec<(Arc<BxesValue>, Arc<BxesValue>)>>, BxesReadError> {
   let attributes_count = try_read_count(context, leb_128)?;
   if attributes_count == 0 {
     Ok(None)
@@ -319,7 +320,7 @@ fn try_read_count(context: &mut ReadContext, leb_128: bool) -> Result<u32, BxesR
   }
 }
 
-fn try_read_kv_pair(context: &mut ReadContext, leb_128: bool) -> Result<(Rc<BxesValue>, Rc<BxesValue>), BxesReadError> {
+fn try_read_kv_pair(context: &mut ReadContext, leb_128: bool) -> Result<(Arc<BxesValue>, Arc<BxesValue>), BxesReadError> {
   let kv_index = try_read_count(context, leb_128)? as usize;
 
   let kv_pair = match context.metadata.kv_pairs.as_ref().unwrap().get(kv_index) {
@@ -371,7 +372,7 @@ pub fn try_read_values(context: &mut ReadContext) -> Result<(), BxesReadError> {
   let values_count = try_read_u32(reader)?;
   for _ in 0..values_count {
     let value = try_read_bxes_value(context)?;
-    context.metadata.values.as_mut().unwrap().push(Rc::new(value));
+    context.metadata.values.as_mut().unwrap().push(Arc::new(value));
   }
 
   Ok(())
@@ -389,7 +390,7 @@ fn try_read_bxes_value(context: &mut ReadContext) -> Result<BxesValue, BxesReadE
     TypeIds::F32 => Ok(BxesValue::Float32(try_read_f32(reader)?)),
     TypeIds::F64 => Ok(BxesValue::Float64(try_read_f64(reader)?)),
     TypeIds::Bool => Ok(BxesValue::Bool(try_read_bool(reader)?)),
-    TypeIds::String => Ok(BxesValue::String(Rc::from(try_read_string(reader)?))),
+    TypeIds::String => Ok(BxesValue::String(Arc::from(try_read_string(reader)?))),
     TypeIds::Timestamp => Ok(BxesValue::Timestamp(try_read_i64(reader)?)),
     TypeIds::BrafLifecycle => Ok(BxesValue::BrafLifecycle(try_read_braf_lifecycle(reader)?)),
     TypeIds::StandardLifecycle => Ok(BxesValue::StandardLifecycle(try_read_standard_lifecycle(reader)?)),
diff --git a/bxes/src/rust/bxes/src/read/single_file_bxes_reader.rs b/bxes/src/rust/bxes/src/read/single_file_bxes_reader.rs
index 89554652e..6faac9848 100644
--- a/bxes/src/rust/bxes/src/read/single_file_bxes_reader.rs
+++ b/bxes/src/rust/bxes/src/read/single_file_bxes_reader.rs
@@ -5,7 +5,7 @@ use tempfile::TempDir;
 use crate::{
   binary_rw::core::{BinaryReader, Endian},
   models::domain::bxes_event_log::BxesEventLog,
-  read::read_context::{ReadContext, ReadMetadata},
+  read::read_context::ReadContext,
 };
 
 use super::{errors::BxesReadError, read_utils::*};
diff --git a/bxes/src/rust/bxes/src/writer/errors.rs b/bxes/src/rust/bxes/src/writer/errors.rs
index 7ba88cce3..655e9345d 100644
--- a/bxes/src/rust/bxes/src/writer/errors.rs
+++ b/bxes/src/rust/bxes/src/writer/errors.rs
@@ -1,5 +1,5 @@
-use std::{fmt::Display, rc::Rc};
-
+use std::fmt::Display;
+use std::sync::Arc;
 use crate::{binary_rw::error::BinaryError, models::domain::bxes_value::BxesValue};
 
 #[derive(Debug)]
@@ -8,8 +8,8 @@ pub enum BxesWriteError {
   WriteError(BinaryError),
   FailedToGetWriterPosition(String),
   FailedToSeek(String),
-  FailedToFindKeyValueIndex((Rc<BxesValue>, Rc<BxesValue>)),
-  FailedToFindValueIndex(Rc<BxesValue>),
+  FailedToFindKeyValueIndex((Arc<BxesValue>, Arc<BxesValue>)),
+  FailedToFindValueIndex(Arc<BxesValue>),
   FailedToCreateTempFile,
   FailedToCreateArchive,
   LebWriteError(String),
diff --git a/bxes/src/rust/bxes/src/writer/write_context.rs b/bxes/src/rust/bxes/src/writer/write_context.rs
index 3a4dae254..a44834554 100644
--- a/bxes/src/rust/bxes/src/writer/write_context.rs
+++ b/bxes/src/rust/bxes/src/writer/write_context.rs
@@ -3,15 +3,15 @@ use std::{
   collections::{HashMap, HashSet},
   rc::Rc,
 };
-
+use std::sync::Arc;
 use crate::{
   binary_rw::core::BinaryWriter,
   models::{domain::bxes_value::BxesValue, system_models::ValueAttributeDescriptor},
 };
 
 pub struct BxesWriteContext<'b> {
-  pub values_indices: Rc<RefCell<HashMap<Rc<BxesValue>, usize>>>,
-  pub kv_indices: Rc<RefCell<HashMap<(Rc<BxesValue>, Rc<BxesValue>), usize>>>,
+  pub values_indices: Rc<RefCell<HashMap<Arc<BxesValue>, usize>>>,
+  pub kv_indices: Rc<RefCell<HashMap<(Arc<BxesValue>, Arc<BxesValue>), usize>>>,
   pub writer: Option<&'b mut BinaryWriter<'b>>,
   pub value_attributes: Option<Vec<ValueAttributeDescriptor>>,
   pub value_attributes_set: Option<HashSet<ValueAttributeDescriptor>>,
diff --git a/bxes/src/rust/bxes/src/writer/writer_utils.rs b/bxes/src/rust/bxes/src/writer/writer_utils.rs
index badd1241e..c01fa9d1c 100644
--- a/bxes/src/rust/bxes/src/writer/writer_utils.rs
+++ b/bxes/src/rust/bxes/src/writer/writer_utils.rs
@@ -6,7 +6,7 @@ use std::{
   path::Path,
   rc::Rc,
 };
-
+use std::sync::Arc;
 use num_traits::ToPrimitive;
 use zip::{ZipWriter, write::FileOptions};
 
@@ -212,7 +212,7 @@ pub fn try_write_leb_128(writer: &mut BinaryWriter, value: u32) -> Result<(), Bx
 
 pub fn try_write_properties(
   context: Rc<RefCell<BxesWriteContext>>,
-  properties: Option<&Vec<(Rc<BxesValue>, Rc<BxesValue>)>>,
+  properties: Option<&Vec<(Arc<BxesValue>, Arc<BxesValue>)>>,
 ) -> Result<(), BxesWriteError> {
   write_collection_and_count(context.clone(), false, count(properties), || {
     if let Some(properties) = properties {
@@ -251,7 +251,7 @@ pub fn try_write_globals(context: Rc<RefCell<BxesWriteContext>>, globals: Option
 
 pub fn try_write_kv_index(
   context: Rc<RefCell<BxesWriteContext>>,
-  kv: &(Rc<BxesValue>, Rc<BxesValue>),
+  kv: &(Arc<BxesValue>, Arc<BxesValue>),
   write_leb_128: bool,
 ) -> Result<(), BxesWriteError> {
   if !context.borrow().kv_indices.borrow().contains_key(kv) {
@@ -303,7 +303,7 @@ pub fn try_write_classifiers(
   })
 }
 
-fn try_write_value_index(context: Rc<RefCell<BxesWriteContext>>, value: Rc<BxesValue>) -> Result<(), BxesWriteError> {
+fn try_write_value_index(context: Rc<RefCell<BxesWriteContext>>, value: Arc<BxesValue>) -> Result<(), BxesWriteError> {
   let exists = context.borrow().values_indices.borrow().contains_key(&value);
 
   if !exists {
@@ -317,7 +317,7 @@ fn try_write_value_index(context: Rc<RefCell<BxesWriteContext>>, value: Rc<BxesV
 
 pub fn try_write_attributes(
   context: Rc<RefCell<BxesWriteContext>>,
-  attributes: Option<&Vec<(Rc<BxesValue>, Rc<BxesValue>)>>,
+  attributes: Option<&Vec<(Arc<BxesValue>, Arc<BxesValue>)>>,
   write_leb_128_count: bool,
 ) -> Result<(), BxesWriteError> {
   write_collection_and_count(context.clone(), write_leb_128_count, count(attributes), || {
@@ -365,8 +365,8 @@ pub fn try_write_key_values(log: &BxesEventLog, context: Rc<RefCell<BxesWriteCon
 }
 
 pub enum ValueOrKeyValue<'a> {
-  Value(&'a Rc<BxesValue>),
-  KeyValue((&'a Rc<BxesValue>, &'a Rc<BxesValue>)),
+  Value(&'a Arc<BxesValue>),
+  KeyValue((&'a Arc<BxesValue>, &'a Arc<BxesValue>)),
 }
 
 fn execute_with_kv_pairs<'a>(
@@ -416,7 +416,7 @@ fn execute_with_kv_pairs<'a>(
 }
 
 fn execute_with_attributes_kv_pairs<'a>(
-  attributes: &'a Vec<(Rc<BxesValue>, Rc<BxesValue>)>,
+  attributes: &'a Vec<(Arc<BxesValue>, Arc<BxesValue>)>,
   action: &mut impl FnMut(ValueOrKeyValue<'a>) -> Result<(), BxesWriteError>,
 ) -> Result<(), BxesWriteError> {
   for (key, value) in attributes {
@@ -497,7 +497,7 @@ fn try_tell_pos(writer: &mut BinaryWriter) -> Result<usize, BxesWriteError> {
   }
 }
 
-pub fn try_write_value_if_not_present(value: &Rc<BxesValue>, context: &mut BxesWriteContext) -> Result<bool, BxesWriteError> {
+pub fn try_write_value_if_not_present(value: &Arc<BxesValue>, context: &mut BxesWriteContext) -> Result<bool, BxesWriteError> {
   if context.values_indices.borrow().contains_key(value) {
     return Ok(false);
   }
@@ -571,7 +571,7 @@ pub fn try_write_artifact(context: &mut BxesWriteContext, artifact: &BxesArtifac
   Ok(())
 }
 
-fn get_index(value: &Rc<BxesValue>, context: &mut BxesWriteContext) -> Result<u32, BxesWriteError> {
+fn get_index(value: &Arc<BxesValue>, context: &mut BxesWriteContext) -> Result<u32, BxesWriteError> {
   if let Some(index) = context.values_indices.borrow().get(value) {
     return Ok(*index as u32);
   }
@@ -579,7 +579,7 @@ fn get_index(value: &Rc<BxesValue>, context: &mut BxesWriteContext) -> Result<u3
   Err(BxesWriteError::FailedToFindValueIndex(value.clone()))
 }
 
-fn get_or_write_value_index(value: &Rc<BxesValue>, context: &mut BxesWriteContext) -> Result<u32, BxesWriteError> {
+fn get_or_write_value_index(value: &Arc<BxesValue>, context: &mut BxesWriteContext) -> Result<u32, BxesWriteError> {
   try_write_value_if_not_present(value, context)?;
   let index = *context.values_indices.borrow().get(value).unwrap() as u32;
 
diff --git a/bxes/src/rust/bxes/tests/test_core/random_log.rs b/bxes/src/rust/bxes/tests/test_core/random_log.rs
index e94760022..b35a1e711 100644
--- a/bxes/src/rust/bxes/tests/test_core/random_log.rs
+++ b/bxes/src/rust/bxes/tests/test_core/random_log.rs
@@ -1,8 +1,8 @@
-use std::{collections::HashMap, rc::Rc};
-
 use bxes::read::read_utils::string_or_err;
 use num_traits::FromPrimitive;
 use rand::{Rng, RngExt, distr::Alphanumeric, rngs::ThreadRng};
+use std::sync::Arc;
+use std::{collections::HashMap, rc::Rc};
 use uuid::Uuid;
 
 use bxes::{
@@ -165,11 +165,11 @@ fn generate_random_event(rng: &mut ThreadRng) -> BxesEvent {
   }
 }
 
-fn generate_random_attributes(rng: &mut ThreadRng) -> Vec<(Rc<BxesValue>, Rc<BxesValue>)> {
+fn generate_random_attributes(rng: &mut ThreadRng) -> Vec<(Arc<BxesValue>, Arc<BxesValue>)> {
   generate_random_list(rng, |rng| generate_random_attribute(rng))
 }
 
-fn generate_random_attributes_option(rng: &mut ThreadRng) -> Option<Vec<(Rc<BxesValue>, Rc<BxesValue>)>> {
+fn generate_random_attributes_option(rng: &mut ThreadRng) -> Option<Vec<(Arc<BxesValue>, Arc<BxesValue>)>> {
   if rng.random_bool(0.8) {
     Some(generate_random_attributes(rng))
   } else {
@@ -177,12 +177,12 @@ fn generate_random_attributes_option(rng: &mut ThreadRng) -> Option<Vec<(Rc<Bxes
   }
 }
 
-fn generate_random_attribute(rng: &mut ThreadRng) -> (Rc<BxesValue>, Rc<BxesValue>) {
+fn generate_random_attribute(rng: &mut ThreadRng) -> (Arc<BxesValue>, Arc<BxesValue>) {
   (generate_random_string_bxes_value(rng), generate_random_bxes_value(rng))
 }
 
-fn generate_random_string_bxes_value(rng: &mut ThreadRng) -> Rc<BxesValue> {
-  Rc::new(BxesValue::String(Rc::from(generate_random_string(rng))))
+fn generate_random_string_bxes_value(rng: &mut ThreadRng) -> Arc<BxesValue> {
+  Arc::new(BxesValue::String(Arc::from(generate_random_string(rng))))
 }
 
 fn generate_random_string(rng: &mut ThreadRng) -> String {
@@ -190,8 +190,8 @@ fn generate_random_string(rng: &mut ThreadRng) -> String {
   rng.sample_iter(&Alphanumeric).take(length).map(char::from).collect()
 }
 
-fn generate_random_bxes_value(rng: &mut ThreadRng) -> Rc<BxesValue> {
-  Rc::new(match generate_random_type_id(rng) {
+fn generate_random_bxes_value(rng: &mut ThreadRng) -> Arc<BxesValue> {
+  Arc::new(match generate_random_type_id(rng) {
     TypeIds::Null => BxesValue::Int32(rng.random()),
     TypeIds::I32 => BxesValue::Int32(rng.random()),
     TypeIds::I64 => BxesValue::Int64(rng.random()),
@@ -200,7 +200,7 @@ fn generate_random_bxes_value(rng: &mut ThreadRng) -> Rc<BxesValue> {
     TypeIds::F32 => BxesValue::Float32(rng.random()),
     TypeIds::F64 => BxesValue::Float64(rng.random()),
     TypeIds::Bool => BxesValue::Bool(rng.random()),
-    TypeIds::String => BxesValue::String(Rc::from(generate_random_string(rng))),
+    TypeIds::String => BxesValue::String(Arc::from(generate_random_string(rng))),
     TypeIds::Timestamp => BxesValue::Timestamp(rng.random()),
     TypeIds::BrafLifecycle => BxesValue::BrafLifecycle(generate_random_braf_lifecycle()),
     TypeIds::StandardLifecycle => BxesValue::StandardLifecycle(generate_random_standard_lifecycle()),
@@ -229,8 +229,8 @@ fn generate_random_drivers(rng: &mut ThreadRng) -> BxesValue {
 fn generate_random_driver(rng: &mut ThreadRng) -> BxesDriver {
   BxesDriver {
     amount: BxesValue::Float64(rng.random()),
-    name: Rc::new(BxesValue::String(Rc::from(generate_random_string(rng)))),
-    driver_type: Rc::new(BxesValue::String(Rc::from(generate_random_string(rng)))),
+    name: Arc::new(BxesValue::String(Arc::from(generate_random_string(rng)))),
+    driver_type: Arc::new(BxesValue::String(Arc::from(generate_random_string(rng)))),
   }
 }
 
@@ -247,9 +247,9 @@ fn generate_random_artifact(rng: &mut ThreadRng) -> BxesValue {
 
 fn generate_random_artifact_item(rng: &mut ThreadRng) -> BxesArtifactItem {
   BxesArtifactItem {
-    model: Rc::new(BxesValue::String(Rc::from(generate_random_string(rng)))),
-    instance: Rc::new(BxesValue::String(Rc::from(generate_random_string(rng)))),
-    transition: Rc::new(BxesValue::String(Rc::from(generate_random_string(rng)))),
+    model: Arc::new(BxesValue::String(Arc::from(generate_random_string(rng)))),
+    instance: Arc::new(BxesValue::String(Arc::from(generate_random_string(rng)))),
+    transition: Arc::new(BxesValue::String(Arc::from(generate_random_string(rng)))),
   }
 }
 
diff --git a/bxes/src/rust/bxes_kafka/src/consumer/bxes_kafka_consumer.rs b/bxes/src/rust/bxes_kafka/src/consumer/bxes_kafka_consumer.rs
index c45d6af94..d878e83fd 100644
--- a/bxes/src/rust/bxes_kafka/src/consumer/bxes_kafka_consumer.rs
+++ b/bxes/src/rust/bxes_kafka/src/consumer/bxes_kafka_consumer.rs
@@ -19,6 +19,7 @@ use rdkafka::{
   error::KafkaError,
 };
 use std::{collections::HashMap, io::Cursor, rc::Rc, time::Duration};
+use std::sync::Arc;
 use uuid::Uuid;
 
 pub struct BxesKafkaConsumer {
@@ -41,12 +42,12 @@ impl BxesKafkaConsumer {
 
 #[derive(Debug, Clone)]
 pub struct BxesKafkaTrace {
-  metadata: HashMap<Rc<str>, Rc<BxesValue>>,
+  metadata: HashMap<Arc<str>, Arc<BxesValue>>,
   events: Vec<BxesEvent>,
 }
 
 impl BxesKafkaTrace {
-  pub fn metadata(&self) -> &HashMap<Rc<str>, Rc<BxesValue>> {
+  pub fn metadata(&self) -> &HashMap<Arc<str>, Arc<BxesValue>> {
     &self.metadata
   }
 
@@ -135,7 +136,7 @@ impl BxesKafkaConsumer {
     Ok(BxesKafkaTrace { metadata, events })
   }
 
-  fn create_trace_metadata(metadata: Vec<(Rc<BxesValue>, Rc<BxesValue>)>) -> Result<HashMap<Rc<str>, Rc<BxesValue>>, BxesReadError> {
+  fn create_trace_metadata(metadata: Vec<(Arc<BxesValue>, Arc<BxesValue>)>) -> Result<HashMap<Arc<str>, Arc<BxesValue>>, BxesReadError> {
     let mut new_metadata = HashMap::new();
 
     for (key, value) in metadata {

From a564b9b5db01d2c56a33cea8620f4a2754e23cf8 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Wed, 6 May 2026 13:28:28 +0300
Subject: [PATCH 41/53] Arc -> PetriNetArc

---
 .../src/features/discovery/petri_net/arc.rs    |  4 ++--
 .../features/discovery/petri_net/petri_net.rs  |  4 ++--
 .../discovery/petri_net/pnml_serialization.rs  | 10 +++++-----
 .../features/discovery/petri_net/transition.rs | 18 +++++++++---------
 .../rust/ficus_backend/src/grpc/converters.rs  |  4 ++--
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/Ficus/src/rust/ficus/src/features/discovery/petri_net/arc.rs b/Ficus/src/rust/ficus/src/features/discovery/petri_net/arc.rs
index 2a67ef450..9534b4b06 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/petri_net/arc.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/petri_net/arc.rs
@@ -1,14 +1,14 @@
 use crate::features::discovery::petri_net::ids::next_id;
 
 #[derive(Debug)]
-pub struct Arc<TArcData> {
+pub struct PetriNetArc<TArcData> {
   id: u64,
   place_id: u64,
   data: Option<TArcData>,
   tokens_count: usize,
 }
 
-impl<TArcData> Arc<TArcData> {
+impl<TArcData> PetriNetArc<TArcData> {
   pub fn new(place_id: u64, data: Option<TArcData>) -> Self {
     Self {
       id: next_id(),
diff --git a/Ficus/src/rust/ficus/src/features/discovery/petri_net/petri_net.rs b/Ficus/src/rust/ficus/src/features/discovery/petri_net/petri_net.rs
index 81115c9a0..2eab8c99f 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/petri_net/petri_net.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/petri_net/petri_net.rs
@@ -1,4 +1,4 @@
-use super::arc::Arc;
+use super::arc::PetriNetArc;
 use crate::features::discovery::petri_net::{marking::Marking, place::Place, transition::Transition};
 use std::{collections::HashMap, rc::Rc};
 
@@ -137,7 +137,7 @@ where
     if result.is_empty() { None } else { Some(result) }
   }
 
-  pub fn arc(&self, id: &u64) -> Option<(&Arc<TArcData>, &Transition<TTransitionData, TArcData>)> {
+  pub fn arc(&self, id: &u64) -> Option<(&PetriNetArc<TArcData>, &Transition<TTransitionData, TArcData>)> {
     for transition in self.transitions.values() {
       for arc in transition.outgoing_arcs() {
         if arc.id() == *id {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/petri_net/pnml_serialization.rs b/Ficus/src/rust/ficus/src/features/discovery/petri_net/pnml_serialization.rs
index a76eb6225..e80b3874f 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/petri_net/pnml_serialization.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/petri_net/pnml_serialization.rs
@@ -1,5 +1,5 @@
 use crate::{
-  features::discovery::petri_net::{arc::Arc, petri_net::PetriNet, place::Place, transition::Transition},
+  features::discovery::petri_net::{arc::PetriNetArc, petri_net::PetriNet, place::Place, transition::Transition},
   utils::xml_utils::{StartEndElementCookie, XmlWriteError},
 };
 use quick_xml::{
@@ -185,11 +185,11 @@ where
 }
 
 fn patch_arcs_list<TArcData>(
-  arcs: &[Arc<TArcData>],
+  arcs: &[PetriNetArc<TArcData>],
   use_names_as_ids: bool,
-  names_creator: impl Fn(&Arc<TArcData>) -> String,
-) -> Vec<(&Arc<TArcData>, String)> {
-  let mut arcs: Vec<(&Arc<TArcData>, String)> = arcs
+  names_creator: impl Fn(&PetriNetArc<TArcData>) -> String,
+) -> Vec<(&PetriNetArc<TArcData>, String)> {
+  let mut arcs: Vec<(&PetriNetArc<TArcData>, String)> = arcs
     .iter()
     .map(|arc| {
       (
diff --git a/Ficus/src/rust/ficus/src/features/discovery/petri_net/transition.rs b/Ficus/src/rust/ficus/src/features/discovery/petri_net/transition.rs
index 5d5d1f0d4..447ff9244 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/petri_net/transition.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/petri_net/transition.rs
@@ -1,4 +1,4 @@
-use crate::features::discovery::petri_net::{arc::Arc, ids::next_id};
+use crate::features::discovery::petri_net::{arc::PetriNetArc, ids::next_id};
 use std::{
   hash::{Hash, Hasher},
   rc::Rc,
@@ -12,8 +12,8 @@ where
   id: u64,
   name: Rc<str>,
   silent_transition: bool,
-  incoming_arcs: Vec<Arc<TArcData>>,
-  outgoing_arcs: Vec<Arc<TArcData>>,
+  incoming_arcs: Vec<PetriNetArc<TArcData>>,
+  outgoing_arcs: Vec<PetriNetArc<TArcData>>,
   data: Option<TTransitionData>,
 }
 
@@ -53,18 +53,18 @@ where
   }
 
   pub fn add_incoming_arc(&mut self, place_id: &u64, data: Option<TArcData>) {
-    self.incoming_arcs.push(Arc::new(*place_id, data))
+    self.incoming_arcs.push(PetriNetArc::new(*place_id, data))
   }
 
   pub fn add_outgoing_arc(&mut self, place_id: &u64, data: Option<TArcData>) {
-    self.outgoing_arcs.push(Arc::new(*place_id, data))
+    self.outgoing_arcs.push(PetriNetArc::new(*place_id, data))
   }
 
-  pub fn remove_incoming_arc(&mut self, arc_index: usize) -> Arc<TArcData> {
+  pub fn remove_incoming_arc(&mut self, arc_index: usize) -> PetriNetArc<TArcData> {
     self.incoming_arcs.remove(arc_index)
   }
 
-  pub fn remove_outgoing_arc(&mut self, arc_index: usize) -> Arc<TArcData> {
+  pub fn remove_outgoing_arc(&mut self, arc_index: usize) -> PetriNetArc<TArcData> {
     self.outgoing_arcs.remove(arc_index)
   }
 
@@ -72,11 +72,11 @@ where
     self.id
   }
 
-  pub fn incoming_arcs(&self) -> &Vec<Arc<TArcData>> {
+  pub fn incoming_arcs(&self) -> &Vec<PetriNetArc<TArcData>> {
     &self.incoming_arcs
   }
 
-  pub fn outgoing_arcs(&self) -> &Vec<Arc<TArcData>> {
+  pub fn outgoing_arcs(&self) -> &Vec<PetriNetArc<TArcData>> {
     &self.outgoing_arcs
   }
 
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/converters.rs b/Ficus/src/rust/ficus_backend/src/grpc/converters.rs
index 3d41c1d2e..8f40bd45d 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/converters.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/converters.rs
@@ -55,7 +55,7 @@ use ficus::{
       ocel::graph_annotation::{NodeObjectsState, OcelAnnotation, OcelObjectRelations},
       petri_net::{
         annotations::TimeAnnotationKind,
-        arc::Arc,
+        arc::PetriNetArc,
         marking::{Marking, SingleMarking},
         petri_net::DefaultPetriNet,
         place::Place,
@@ -676,7 +676,7 @@ where
   }
 }
 
-fn convert_to_grpc_arc<TArcData>(arc: &Arc<TArcData>) -> GrpcPetriNetArc {
+fn convert_to_grpc_arc<TArcData>(arc: &PetriNetArc<TArcData>) -> GrpcPetriNetArc {
   GrpcPetriNetArc {
     id: arc.id() as i64,
     place_id: arc.place_id() as i64,

From 7778c59ee337d7b85ef56ed9463ab0125de5e09b Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Wed, 6 May 2026 13:47:14 +0300
Subject: [PATCH 42/53] Rc -> Arc

---
 .../event_log/bxes/bxes_to_xes_converter.rs   | 12 ++--
 .../ficus/src/event_log/bxes/conversions.rs   | 13 ++--
 .../event_log/bxes/xes_to_bxes_converter.rs   | 32 ++++-----
 .../ficus/src/event_log/core/event/event.rs   | 27 ++++----
 .../src/event_log/core/event/event_base.rs    |  7 +-
 .../src/event_log/core/event/events_holder.rs |  7 +-
 .../ficus/src/event_log/core/log_iterator.rs  |  2 +-
 .../ficus/src/event_log/core/trace/trace.rs   |  4 +-
 .../ficus/src/event_log/xes/logs_merger.rs    |  3 +-
 .../xes/reader/file_xes_log_reader.rs         | 24 +++----
 .../ficus/src/event_log/xes/reader/utils.rs   | 22 +++----
 .../xes/reader/xes_log_trace_reader.rs        | 26 ++++----
 .../rust/ficus/src/event_log/xes/shared.rs    | 19 +++---
 .../rust/ficus/src/event_log/xes/simple.rs    |  3 +-
 .../rust/ficus/src/event_log/xes/xes_event.rs | 25 ++++---
 .../ficus/src/event_log/xes/xes_event_log.rs  | 11 ++--
 .../analysis/directly_follows_graph.rs        |  7 +-
 .../features/analysis/entropy/dfg_entropy.rs  | 21 +++---
 .../features/analysis/entropy/pos_entropy.rs  |  7 +-
 .../analysis/entropy/pos_entropy_fast.rs      |  7 +-
 .../src/features/analysis/entropy/shared.rs   | 12 ++--
 .../features/analysis/log_info/dfg_info.rs    | 22 +++----
 .../analysis/log_info/event_log_info.rs       | 35 +++++-----
 .../log_info/log_info_creation_dto.rs         | 13 ++--
 .../analysis/patterns/activity_instances.rs   | 13 ++--
 .../analysis/patterns/entry_points.rs         |  4 +-
 .../features/analysis/patterns/repeat_sets.rs | 12 ++--
 .../analysis/patterns/strict_loops.rs         |  3 +-
 .../src/rust/ficus/src/features/cases/mod.rs  |  6 +-
 .../activities/activities_common.rs           |  4 +-
 .../features/clustering/activities/merging.rs |  4 +-
 .../ficus/src/features/clustering/common.rs   |  9 ++-
 .../src/features/clustering/traces/common.rs  | 11 ++--
 .../src/features/discovery/alpha/alpha.rs     |  4 +-
 .../alpha_plus_plus_nfc.rs                    |  6 +-
 .../alpha_plus_plus_nfc_triple.rs             | 28 ++++----
 .../alpha_plus_plus_nfc/extended_alpha_set.rs | 44 ++++++-------
 .../alpha/alpha_plus_plus_nfc/w3_pair.rs      | 12 ++--
 .../src/features/discovery/alpha/alpha_set.rs | 14 ++--
 .../providers/alpha_plus_nfc_provider.rs      |  7 +-
 .../alpha/providers/alpha_plus_provider.rs    | 11 ++--
 .../alpha/providers/alpha_sharp_provider.rs   |  5 +-
 .../features/discovery/ecfg/adjustments.rs    |  4 +-
 .../src/features/discovery/ecfg/context.rs    |  4 +-
 .../src/features/discovery/ecfg/discovery.rs  |  6 +-
 .../features/discovery/ecfg/discovery_xes.rs  |  5 +-
 .../features/discovery/ecfg/log_prepare.rs    |  3 +-
 .../features/discovery/fuzzy/fuzzy_miner.rs   |  9 +--
 .../discovery/heuristic/heuristic_miner.rs    |  3 +-
 .../discovery/heuristic/relations_provider.rs |  7 +-
 .../discovery/multithreaded_dfg/dfg.rs        |  5 +-
 .../discovery/ocel/graph_annotation.rs        | 18 ++---
 .../discovery/petri_net/annotations.rs        |  7 +-
 .../features/discovery/petri_net/petri_net.rs |  5 +-
 .../features/discovery/petri_net/replay.rs    |  5 +-
 .../discovery/petri_net/transition.rs         |  6 +-
 .../discovery/timeline/abstraction.rs         | 27 ++++----
 .../features/discovery/timeline/discovery.rs  | 15 +++--
 .../software_data/extraction_config.rs        | 57 ++++++++--------
 .../extractors/activities_durations.rs        |  3 +-
 .../timeline/software_data/extractors/core.rs |  7 +-
 .../timeline/software_data/extractors/ocel.rs | 15 +++--
 .../software_data/extractors/utils.rs         |  9 +--
 .../timeline/software_data/models.rs          | 23 +++----
 .../src/features/discovery/timeline/utils.rs  |  4 +-
 .../ficus/src/features/mutations/mutations.rs | 15 +++--
 .../streaming/counters/sliding_window.rs      |  5 +-
 .../ficus/src/pipelines/activities_parts.rs   |  9 +--
 .../rust/ficus/src/pipelines/drawing_parts.rs | 17 ++---
 .../ficus/src/pipelines/keys/context_keys.rs  | 43 ++++++------
 .../ficus/src/pipelines/multithreading.rs     | 33 +++++-----
 Ficus/src/rust/ficus/src/utils/colors.rs      | 14 ++--
 .../src/rust/ficus/src/utils/display_name.rs  |  6 +-
 Ficus/src/rust/ficus/src/utils/graph/graph.rs |  5 +-
 .../src/utils/graph/graph_conversions.rs      | 11 ++--
 Ficus/src/rust/ficus/src/utils/references.rs  |  7 +-
 Ficus/src/rust/ficus/src/utils/vec_utils.rs   |  4 +-
 .../ficus/tests/analysis/analysis_tests.rs    | 42 ++++++------
 .../patterns/activities_instances_tests.rs    |  5 +-
 .../ficus/tests/discovery/ecfg_discovery.rs   |  4 +-
 .../discovery/multithreaded_dfg_tests.rs      |  5 +-
 .../ficus/tests/mutations/mutations_tests.rs  |  9 +--
 .../tests/other/test_simple_event_log.rs      |  3 +-
 .../tests/software_data/extractors_tests.rs   | 65 ++++++++++---------
 .../rust/ficus/tests/utils/user_data_tests.rs |  6 +-
 .../rust/ficus_backend/src/grpc/converters.rs | 17 ++---
 .../src/grpc/events/kafka_events_handler.rs   | 10 +--
 .../src/grpc/kafka/grpc_kafka_service.rs      |  4 +-
 .../ficus_backend/src/grpc/kafka/models.rs    | 29 ++++-----
 .../kafka/streaming/t2/dfg_data_structures.rs | 17 ++---
 90 files changed, 615 insertions(+), 575 deletions(-)

diff --git a/Ficus/src/rust/ficus/src/event_log/bxes/bxes_to_xes_converter.rs b/Ficus/src/rust/ficus/src/event_log/bxes/bxes_to_xes_converter.rs
index 2d3ddf4a7..7f85d9d57 100644
--- a/Ficus/src/rust/ficus/src/event_log/bxes/bxes_to_xes_converter.rs
+++ b/Ficus/src/rust/ficus/src/event_log/bxes/bxes_to_xes_converter.rs
@@ -14,7 +14,7 @@ use bxes::{
 };
 use chrono::{TimeZone, Utc};
 use std::{cell::RefCell, collections::HashMap, fmt::Display, rc::Rc};
-
+use std::sync::Arc;
 use super::conversions::{bxes_value_to_payload_value, global_type_to_string};
 use crate::event_log::{
   core::{event::event::EventPayloadValue, event_log::EventLog, trace::trace::Trace},
@@ -139,7 +139,7 @@ fn set_extensions(xes_log: &mut XesEventLogImpl, log: &BxesEventLog) -> Result<(
 fn set_globals(xes_log: &mut XesEventLogImpl, log: &BxesEventLog) -> Result<(), BxesToXesReadError> {
   if let Some(globals) = log.metadata.globals.as_ref() {
     for global in globals {
-      let global_type = Rc::from(global_type_to_string(&global.entity_kind));
+      let global_type = Arc::from(global_type_to_string(&global.entity_kind));
 
       let mut globals_map = HashMap::new();
       for global_value in &global.globals {
@@ -154,7 +154,7 @@ fn set_globals(xes_log: &mut XesEventLogImpl, log: &BxesEventLog) -> Result<(),
   Ok(())
 }
 
-fn vector_of_strings_or_err(values: &Vec<Rc<BxesValue>>, entity_name: &str) -> Result<Vec<Rc<str>>, BxesToXesReadError> {
+fn vector_of_strings_or_err(values: &Vec<Arc<BxesValue>>, entity_name: &str) -> Result<Vec<Arc<str>>, BxesToXesReadError> {
   let mut result = vec![];
   for value in values {
     result.push(string_or_err(value, entity_name)?)
@@ -163,7 +163,7 @@ fn vector_of_strings_or_err(values: &Vec<Rc<BxesValue>>, entity_name: &str) -> R
   Ok(result)
 }
 
-fn string_or_err(value: &BxesValue, entity_name: &str) -> Result<Rc<str>, BxesToXesReadError> {
+fn string_or_err(value: &BxesValue, entity_name: &str) -> Result<Arc<str>, BxesToXesReadError> {
   if let BxesValue::String(string) = value {
     Ok(string.clone())
   } else {
@@ -186,8 +186,8 @@ fn create_xes_event(bxes_event: &BxesEvent) -> Result<XesEventImpl, BxesToXesRea
 }
 
 fn create_xes_payload(
-  attributes: Option<&Vec<(Rc<BxesValue>, Rc<BxesValue>)>>,
-) -> Result<Option<HashMap<Rc<str>, EventPayloadValue>>, BxesToXesReadError> {
+  attributes: Option<&Vec<(Arc<BxesValue>, Arc<BxesValue>)>>,
+) -> Result<Option<HashMap<Arc<str>, EventPayloadValue>>, BxesToXesReadError> {
   if let Some(attributes) = attributes {
     let mut payload = HashMap::new();
 
diff --git a/Ficus/src/rust/ficus/src/event_log/bxes/conversions.rs b/Ficus/src/rust/ficus/src/event_log/bxes/conversions.rs
index cb795d9a3..6692c7579 100644
--- a/Ficus/src/rust/ficus/src/event_log/bxes/conversions.rs
+++ b/Ficus/src/rust/ficus/src/event_log/bxes/conversions.rs
@@ -1,5 +1,4 @@
-use std::rc::Rc;
-
+use std::sync::Arc;
 use bxes::{
   models::domain::{
     bxes_artifact::{BxesArtifact, BxesArtifactItem},
@@ -107,9 +106,9 @@ pub(super) fn payload_value_to_bxes_value(value: &EventPayloadValue) -> BxesValu
         .items
         .iter()
         .map(|a| BxesArtifactItem {
-          instance: Rc::new(BxesValue::String(Rc::from(a.instance.clone()))),
-          model: Rc::new(BxesValue::String(Rc::from(a.model.clone()))),
-          transition: Rc::new(BxesValue::String(Rc::from(a.transition.clone()))),
+          instance: Arc::new(BxesValue::String(Arc::from(a.instance.clone()))),
+          model: Arc::new(BxesValue::String(Arc::from(a.model.clone()))),
+          transition: Arc::new(BxesValue::String(Arc::from(a.transition.clone()))),
         })
         .collect(),
     }),
@@ -119,8 +118,8 @@ pub(super) fn payload_value_to_bxes_value(value: &EventPayloadValue) -> BxesValu
         .iter()
         .map(|d| BxesDriver {
           amount: BxesValue::Float64(d.amount),
-          driver_type: Rc::new(BxesValue::String(Rc::from(d.driver_type.clone()))),
-          name: Rc::new(BxesValue::String(Rc::from(d.name.clone()))),
+          driver_type: Arc::new(BxesValue::String(Arc::from(d.driver_type.clone()))),
+          name: Arc::new(BxesValue::String(Arc::from(d.name.clone()))),
         })
         .collect(),
     }),
diff --git a/Ficus/src/rust/ficus/src/event_log/bxes/xes_to_bxes_converter.rs b/Ficus/src/rust/ficus/src/event_log/bxes/xes_to_bxes_converter.rs
index 594a29ba7..f3eecae33 100644
--- a/Ficus/src/rust/ficus/src/event_log/bxes/xes_to_bxes_converter.rs
+++ b/Ficus/src/rust/ficus/src/event_log/bxes/xes_to_bxes_converter.rs
@@ -1,5 +1,5 @@
-use std::{fmt::Display, rc::Rc};
-
+use std::fmt::Display;
+use std::sync::Arc;
 use super::conversions::{parse_entity_kind, payload_value_to_bxes_value};
 use crate::event_log::{
   core::{
@@ -98,7 +98,7 @@ fn create_bxes_traces(log: &XesEventLogImpl) -> Vec<BxesTraceVariant> {
 
 fn create_bxes_event(log: &XesEventLogImpl, event: &XesEventImpl) -> BxesEvent {
   BxesEvent {
-    name: Rc::new(BxesValue::String(event.name_pointer().clone())),
+    name: Arc::new(BxesValue::String(event.name_pointer().clone())),
     timestamp: event.timestamp().timestamp_nanos_opt().expect("timestamp_nanos_opt"),
     attributes: Some(
       event
@@ -111,7 +111,7 @@ fn create_bxes_event(log: &XesEventLogImpl, event: &XesEventImpl) -> BxesEvent {
   }
 }
 
-fn is_not_default_attribute(log: &XesEventLogImpl, kv: &(&Rc<str>, &EventPayloadValue)) -> bool {
+fn is_not_default_attribute(log: &XesEventLogImpl, kv: &(&Arc<str>, &EventPayloadValue)) -> bool {
   if let Some(event_globals) = log.globals_map().get(EVENT_TAG_NAME_STR) {
     if let Some(default_value) = event_globals.get(kv.0) {
       default_value != kv.1
@@ -128,8 +128,8 @@ fn create_bxes_classifiers(log: &XesEventLogImpl) -> Vec<BxesClassifier> {
     .classifiers()
     .iter()
     .map(|c| BxesClassifier {
-      keys: c.keys.iter().map(|x| Rc::new(BxesValue::String(x.to_owned()))).collect(),
-      name: Rc::new(BxesValue::String(c.name.to_owned())),
+      keys: c.keys.iter().map(|x| Arc::new(BxesValue::String(x.to_owned()))).collect(),
+      name: Arc::new(BxesValue::String(c.name.to_owned())),
     })
     .collect()
 }
@@ -140,9 +140,9 @@ fn create_bxes_extensions(log: &XesEventLogImpl) -> Vec<BxesExtension> {
 
 fn convert_to_bxes_extension(e: &XesEventLogExtension) -> BxesExtension {
   BxesExtension {
-    name: Rc::new(BxesValue::String(e.name.to_owned())),
-    prefix: Rc::new(BxesValue::String(e.prefix.to_owned())),
-    uri: Rc::new(BxesValue::String(e.uri.to_owned())),
+    name: Arc::new(BxesValue::String(e.name.to_owned())),
+    prefix: Arc::new(BxesValue::String(e.prefix.to_owned())),
+    uri: Arc::new(BxesValue::String(e.uri.to_owned())),
   }
 }
 
@@ -158,14 +158,14 @@ fn create_bxes_globals(log: &XesEventLogImpl) -> Result<Vec<BxesGlobal>, XesToBx
   Ok(globals)
 }
 
-fn convert_to_bxes_global_attribute(kv: &(&Rc<str>, &EventPayloadValue)) -> (Rc<BxesValue>, Rc<BxesValue>) {
-  let key = Rc::new(BxesValue::String(kv.0.to_owned()));
-  let value = Rc::new(payload_value_to_bxes_value(kv.1));
+fn convert_to_bxes_global_attribute(kv: &(&Arc<str>, &EventPayloadValue)) -> (Arc<BxesValue>, Arc<BxesValue>) {
+  let key = Arc::new(BxesValue::String(kv.0.clone()));
+  let value = Arc::new(payload_value_to_bxes_value(kv.1));
 
   (key, value)
 }
 
-fn create_bxes_properties(log: &XesEventLogImpl) -> Vec<(Rc<BxesValue>, Rc<BxesValue>)> {
+fn create_bxes_properties(log: &XesEventLogImpl) -> Vec<(Arc<BxesValue>, Arc<BxesValue>)> {
   log
     .properties_map()
     .iter()
@@ -173,9 +173,9 @@ fn create_bxes_properties(log: &XesEventLogImpl) -> Vec<(Rc<BxesValue>, Rc<BxesV
     .collect()
 }
 
-fn kv_pair_to_bxes_pair(kv: &(&Rc<str>, &EventPayloadValue)) -> (Rc<BxesValue>, Rc<BxesValue>) {
+fn kv_pair_to_bxes_pair(kv: &(&Arc<str>, &EventPayloadValue)) -> (Arc<BxesValue>, Arc<BxesValue>) {
   let bxes_value = payload_value_to_bxes_value(kv.1);
-  let key = Rc::new(BxesValue::String(kv.0.to_owned()));
+  let key = Arc::new(BxesValue::String(kv.0.clone()));
 
-  (key, Rc::new(bxes_value))
+  (key, Arc::new(bxes_value))
 }
diff --git a/Ficus/src/rust/ficus/src/event_log/core/event/event.rs b/Ficus/src/rust/ficus/src/event_log/core/event/event.rs
index a376099ce..a4cb1f519 100644
--- a/Ficus/src/rust/ficus/src/event_log/core/event/event.rs
+++ b/Ficus/src/rust/ficus/src/event_log/core/event/event.rs
@@ -2,13 +2,14 @@ use crate::utils::user_data::user_data::UserDataOwner;
 
 use super::lifecycle::xes_lifecycle::Lifecycle;
 use chrono::{DateTime, Utc};
-use std::{collections::HashMap, fmt::Debug, rc::Rc};
+use std::sync::Arc;
+use std::{collections::HashMap, fmt::Debug};
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum EventPayloadValue {
   Null,
   Date(DateTime<Utc>),
-  String(Rc<str>),
+  String(Arc<str>),
   Boolean(bool),
   Int32(i32),
   Int64(i64),
@@ -60,12 +61,12 @@ pub enum EventPayloadSoftwareEventType {
 }
 
 impl EventPayloadValue {
-  pub fn to_string_repr(&self) -> Rc<str> {
+  pub fn to_string_repr(&self) -> Arc<str> {
     if let EventPayloadValue::String(string) = self {
       return string.clone();
     }
 
-    Rc::from(match self {
+    Arc::from(match self {
       EventPayloadValue::Null => "NULL".to_string(),
       EventPayloadValue::Date(date) => date.to_rfc3339(),
       EventPayloadValue::Boolean(bool) => bool.to_string(),
@@ -87,19 +88,19 @@ impl EventPayloadValue {
 }
 
 pub trait Event: Clone + Debug + UserDataOwner {
-  fn new(name: Rc<str>, stamp: DateTime<Utc>) -> Self;
-  fn new_with_min_date(name: Rc<str>) -> Self;
-  fn new_with_max_date(name: Rc<str>) -> Self;
+  fn new(name: Arc<str>, stamp: DateTime<Utc>) -> Self;
+  fn new_with_min_date(name: Arc<str>) -> Self;
+  fn new_with_max_date(name: Arc<str>) -> Self;
 
   fn name(&self) -> &str;
-  fn name_pointer(&self) -> &Rc<str>;
+  fn name_pointer(&self) -> &Arc<str>;
 
   fn timestamp(&self) -> &DateTime<Utc>;
-  fn payload_map(&self) -> Option<&HashMap<Rc<str>, EventPayloadValue>>;
-  fn payload_map_mut(&mut self) -> Option<&mut HashMap<Rc<str>, EventPayloadValue>>;
-  fn ordered_payload(&self) -> Vec<(&Rc<str>, &EventPayloadValue)>;
+  fn payload_map(&self) -> Option<&HashMap<Arc<str>, EventPayloadValue>>;
+  fn payload_map_mut(&mut self) -> Option<&mut HashMap<Arc<str>, EventPayloadValue>>;
+  fn ordered_payload(&self) -> Vec<(&Arc<str>, &EventPayloadValue)>;
 
-  fn set_name(&mut self, new_name: Rc<str>);
+  fn set_name(&mut self, new_name: Arc<str>);
   fn set_timestamp(&mut self, new_timestamp: DateTime<Utc>);
-  fn add_or_update_payload(&mut self, key: Rc<str>, value: EventPayloadValue);
+  fn add_or_update_payload(&mut self, key: Arc<str>, value: EventPayloadValue);
 }
diff --git a/Ficus/src/rust/ficus/src/event_log/core/event/event_base.rs b/Ficus/src/rust/ficus/src/event_log/core/event/event_base.rs
index 25298d8b1..260af69da 100644
--- a/Ficus/src/rust/ficus/src/event_log/core/event/event_base.rs
+++ b/Ficus/src/rust/ficus/src/event_log/core/event/event_base.rs
@@ -1,18 +1,17 @@
-use std::rc::Rc;
-
+use std::sync::Arc;
 use chrono::{DateTime, Utc};
 
 use crate::utils::user_data::user_data::UserDataImpl;
 
 #[derive(Debug)]
 pub struct EventBase {
-  pub name: Rc<str>,
+  pub name: Arc<str>,
   pub timestamp: DateTime<Utc>,
   pub user_data: UserDataImpl,
 }
 
 impl EventBase {
-  pub fn new(name: Rc<str>, timestamp: DateTime<Utc>) -> Self {
+  pub fn new(name: Arc<str>, timestamp: DateTime<Utc>) -> Self {
     Self {
       name,
       timestamp,
diff --git a/Ficus/src/rust/ficus/src/event_log/core/event/events_holder.rs b/Ficus/src/rust/ficus/src/event_log/core/event/events_holder.rs
index 2480c5ae6..b3ab41556 100644
--- a/Ficus/src/rust/ficus/src/event_log/core/event/events_holder.rs
+++ b/Ficus/src/rust/ficus/src/event_log/core/event/events_holder.rs
@@ -8,6 +8,7 @@ use crate::{
 use super::event::Event;
 use log::debug;
 use std::{cell::RefCell, collections::HashMap, rc::Rc};
+use std::sync::Arc;
 
 #[derive(Debug)]
 pub struct EventsHolder<TEvent>
@@ -122,12 +123,12 @@ where
 
 #[derive(Debug)]
 pub struct EventSequenceInfo {
-  events_counts: HashMap<Rc<str>, usize>,
+  events_counts: HashMap<Arc<str>, usize>,
   events_count: usize,
 }
 
 impl TraceInfo for EventSequenceInfo {
-  fn events_counts(&self) -> &HashMap<Rc<str>, usize> {
+  fn events_counts(&self) -> &HashMap<Arc<str>, usize> {
     &self.events_counts
   }
 
@@ -155,7 +156,7 @@ impl EventSequenceInfo {
 
 #[derive(Debug)]
 pub struct EventsPositions {
-  positions: HashMap<Rc<str>, Vec<usize>>,
+  positions: HashMap<Arc<str>, Vec<usize>>,
 }
 
 impl EventsPositions {
diff --git a/Ficus/src/rust/ficus/src/event_log/core/log_iterator.rs b/Ficus/src/rust/ficus/src/event_log/core/log_iterator.rs
index e9421cd79..3fdc2c2e6 100644
--- a/Ficus/src/rust/ficus/src/event_log/core/log_iterator.rs
+++ b/Ficus/src/rust/ficus/src/event_log/core/log_iterator.rs
@@ -1,5 +1,5 @@
 use std::{cell::RefCell, rc::Rc};
-
+use std::sync::Arc;
 use super::{event_log::EventLog, trace::trace::Trace};
 
 pub struct LogIterator<TLog, TEventProcessor, TResult>
diff --git a/Ficus/src/rust/ficus/src/event_log/core/trace/trace.rs b/Ficus/src/rust/ficus/src/event_log/core/trace/trace.rs
index affbf9f1b..f4b242700 100644
--- a/Ficus/src/rust/ficus/src/event_log/core/trace/trace.rs
+++ b/Ficus/src/rust/ficus/src/event_log/core/trace/trace.rs
@@ -1,5 +1,5 @@
 use std::{cell::RefCell, collections::HashMap, rc::Rc};
-
+use std::sync::Arc;
 use crate::event_log::core::event::event::{Event, EventPayloadValue};
 
 pub trait Trace: Clone + Default {
@@ -29,7 +29,7 @@ pub trait Trace: Clone + Default {
 }
 
 pub trait TraceInfo {
-  fn events_counts(&self) -> &HashMap<Rc<str>, usize>;
+  fn events_counts(&self) -> &HashMap<Arc<str>, usize>;
   fn events_count(&self) -> usize;
 }
 
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/logs_merger.rs b/Ficus/src/rust/ficus/src/event_log/xes/logs_merger.rs
index 5ac88ff49..f7c97dc1f 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/logs_merger.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/logs_merger.rs
@@ -4,8 +4,9 @@ use crate::event_log::{
 };
 use log::error;
 use std::rc::Rc;
+use std::sync::Arc;
 
-pub fn merge_xes_logs(paths: &Vec<Rc<str>>) -> XesEventLogImpl {
+pub fn merge_xes_logs(paths: &Vec<Arc<str>>) -> XesEventLogImpl {
   let mut merged_log = XesEventLogImpl::default();
 
   for path in paths {
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/reader/file_xes_log_reader.rs b/Ficus/src/rust/ficus/src/event_log/xes/reader/file_xes_log_reader.rs
index 4c56724bc..3eb5d1384 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/reader/file_xes_log_reader.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/reader/file_xes_log_reader.rs
@@ -5,7 +5,7 @@ use std::{
   io::{BufRead, BufReader, Cursor, Read},
   rc::Rc,
 };
-
+use std::sync::Arc;
 use quick_xml::{Reader, events::BytesStart};
 
 use crate::event_log::{
@@ -52,7 +52,7 @@ impl<'a> BufRead for XmlReader<'a> {
 pub struct FromFileXesEventLogReader<'a> {
   storage: Rc<RefCell<Vec<u8>>>,
   reader: Rc<RefCell<Reader<XmlReader<'a>>>>,
-  seen_globals: Rc<RefCell<HashMap<Rc<str>, HashMap<Rc<str>, EventPayloadValue>>>>,
+  seen_globals: Rc<RefCell<HashMap<Arc<str>, HashMap<Arc<str>, EventPayloadValue>>>>,
 }
 
 pub enum XesEventLogItem<'a> {
@@ -152,8 +152,8 @@ impl<'a> FromFileXesEventLogReader<'a> {
     Some(Self::create_quickxml_reader(XmlReader::FileReader(BufReader::new(file))))
   }
 
-  fn try_read_scope_name(tag: &BytesStart) -> Option<Rc<str>> {
-    let mut scope_name: Option<Rc<str>> = None;
+  fn try_read_scope_name(tag: &BytesStart) -> Option<Arc<str>> {
+    let mut scope_name: Option<Arc<str>> = None;
 
     for attr in tag.attributes() {
       match attr {
@@ -199,8 +199,8 @@ impl<'a> FromFileXesEventLogReader<'a> {
     }
   }
 
-  fn try_read_global(reader: &mut Reader<XmlReader>, storage: &mut Vec<u8>) -> Option<HashMap<Rc<str>, EventPayloadValue>> {
-    let mut map: Option<HashMap<Rc<str>, EventPayloadValue>> = None;
+  fn try_read_global(reader: &mut Reader<XmlReader>, storage: &mut Vec<u8>) -> Option<HashMap<Arc<str>, EventPayloadValue>> {
+    let mut map: Option<HashMap<Arc<str>, EventPayloadValue>> = None;
 
     loop {
       match reader.read_event_into(storage) {
@@ -230,8 +230,8 @@ impl<'a> FromFileXesEventLogReader<'a> {
   }
 
   fn try_read_classifier(tag: &BytesStart) -> Option<XesClassifier> {
-    let mut name: Option<Rc<str>> = None;
-    let mut keys: Option<Vec<Rc<str>>> = None;
+    let mut name: Option<Arc<str>> = None;
+    let mut keys: Option<Vec<Arc<str>>> = None;
 
     for attr in tag.attributes() {
       match attr {
@@ -242,7 +242,7 @@ impl<'a> FromFileXesEventLogReader<'a> {
             }
           }
           KEYS_ATTR_NAME => match String::from_utf8(real_attr.value.into_owned()) {
-            Ok(keys_string) => keys = Some(keys_string.split(" ").map(|s| Rc::from(s.to_owned())).collect()),
+            Ok(keys_string) => keys = Some(keys_string.split(" ").map(|s| Arc::from(s.to_owned())).collect()),
             Err(_) => return None,
           },
           _ => continue,
@@ -262,9 +262,9 @@ impl<'a> FromFileXesEventLogReader<'a> {
   }
 
   fn try_read_extension(tag: &BytesStart) -> Option<XesEventLogExtension> {
-    let mut name: Option<Rc<str>> = None;
-    let mut prefix: Option<Rc<str>> = None;
-    let mut uri: Option<Rc<str>> = None;
+    let mut name: Option<Arc<str>> = None;
+    let mut prefix: Option<Arc<str>> = None;
+    let mut uri: Option<Arc<str>> = None;
 
     for attr in tag.attributes() {
       match attr {
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/reader/utils.rs b/Ficus/src/rust/ficus/src/event_log/xes/reader/utils.rs
index ce8a66eb8..6fdc266df 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/reader/utils.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/reader/utils.rs
@@ -1,5 +1,5 @@
-use std::{rc::Rc, str::FromStr};
-
+use std::str::FromStr;
+use std::sync::Arc;
 use chrono::{DateTime, Utc};
 
 use crate::event_log::{core::event::event::EventPayloadValue, xes::constants::*};
@@ -16,9 +16,9 @@ pub struct KeyValuePair<TKey, TValue> {
 }
 
 pub struct PayloadTagDescriptor {
-  pub payload_type: Rc<str>,
-  pub key: Rc<str>,
-  pub value: Rc<str>,
+  pub payload_type: Arc<str>,
+  pub key: Arc<str>,
+  pub value: Arc<str>,
 }
 
 pub fn read_payload_like_tag(tag: &BytesStart) -> Option<PayloadTagDescriptor> {
@@ -27,11 +27,11 @@ pub fn read_payload_like_tag(tag: &BytesStart) -> Option<PayloadTagDescriptor> {
     return None;
   }
 
-  let key = Rc::from(unescape(kv.key.as_ref().unwrap()).ok().unwrap().to_string());
-  let value = Rc::from(unescape(kv.value.as_ref().unwrap()).ok().unwrap().to_string());
+  let key = Arc::from(unescape(kv.key.as_ref().unwrap()).ok().unwrap().to_string());
+  let value = Arc::from(unescape(kv.value.as_ref().unwrap()).ok().unwrap().to_string());
 
   let payload_type = match str::from_utf8(tag.name().0) {
-    Ok(string) => Rc::from(string),
+    Ok(string) => Arc::from(string),
     Err(_) => return None,
   };
 
@@ -65,17 +65,17 @@ pub fn extract_key_value(start: &BytesStart) -> KeyValuePair<String, String> {
 }
 
 #[inline]
-pub fn read_attr_value(real_attr: &Attribute, var: &mut Option<Rc<str>>) -> bool {
+pub fn read_attr_value(real_attr: &Attribute, var: &mut Option<Arc<str>>) -> bool {
   match str::from_utf8(real_attr.value.as_ref()) {
     Ok(string) => {
-      *var = Some(Rc::from(string));
+      *var = Some(Arc::from(string));
       true
     }
     Err(_) => false,
   }
 }
 
-pub fn extract_payload_value(name: &[u8], key: &Rc<str>, value: &Rc<str>) -> Option<EventPayloadValue> {
+pub fn extract_payload_value(name: &[u8], key: &Arc<str>, value: &Arc<str>) -> Option<EventPayloadValue> {
   if key.as_ref() == LIFECYCLE_TRANSITION_STR && name == STRING_TAG_NAME {
     return Some(EventPayloadValue::Lifecycle(Lifecycle::from_str(value).ok().unwrap()));
   }
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/reader/xes_log_trace_reader.rs b/Ficus/src/rust/ficus/src/event_log/xes/reader/xes_log_trace_reader.rs
index 0ca2c91f7..06f92c8d3 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/reader/xes_log_trace_reader.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/reader/xes_log_trace_reader.rs
@@ -1,5 +1,5 @@
 use std::{cell::RefCell, collections::HashMap, rc::Rc};
-
+use std::sync::Arc;
 use chrono::{DateTime, Utc};
 use quick_xml::Reader;
 
@@ -13,7 +13,7 @@ use super::utils;
 pub struct TraceXesEventLogIterator<'a> {
   buffer: Vec<u8>,
   reader: Rc<RefCell<Reader<XmlReader<'a>>>>,
-  globals: Rc<RefCell<HashMap<Rc<str>, HashMap<Rc<str>, EventPayloadValue>>>>,
+  globals: Rc<RefCell<HashMap<Arc<str>, HashMap<Arc<str>, EventPayloadValue>>>>,
 }
 
 impl<'a> Iterator for TraceXesEventLogIterator<'a> {
@@ -44,7 +44,7 @@ impl<'a> Iterator for TraceXesEventLogIterator<'a> {
 impl<'a> TraceXesEventLogIterator<'a> {
   pub(crate) fn new(
     reader: Rc<RefCell<Reader<XmlReader>>>,
-    seen_globals: Rc<RefCell<HashMap<Rc<str>, HashMap<Rc<str>, EventPayloadValue>>>>,
+    seen_globals: Rc<RefCell<HashMap<Arc<str>, HashMap<Arc<str>, EventPayloadValue>>>>,
   ) -> TraceXesEventLogIterator {
     TraceXesEventLogIterator {
       reader,
@@ -89,9 +89,9 @@ impl<'a> TraceXesEventLogIterator<'a> {
 
   fn set_defaults_value(
     &self,
-    name: &mut Option<Rc<str>>,
+    name: &mut Option<Arc<str>>,
     date: &mut Option<DateTime<Utc>>,
-    payload: &mut HashMap<Rc<str>, EventPayloadValue>,
+    payload: &mut HashMap<Arc<str>, EventPayloadValue>,
   ) {
     let globals = self.globals.borrow_mut();
     if !globals.contains_key(EVENT_TAG_NAME_STR) {
@@ -105,12 +105,12 @@ impl<'a> TraceXesEventLogIterator<'a> {
 
   fn set_parsed_value(
     payload_type: &[u8],
-    key: &Rc<str>,
-    value: &Rc<str>,
-    name: &mut Option<Rc<str>>,
+    key: &Arc<str>,
+    value: &Arc<str>,
+    name: &mut Option<Arc<str>>,
     date: &mut Option<DateTime<Utc>>,
-    payload: &mut HashMap<Rc<str>, EventPayloadValue>,
-    globals: &HashMap<Rc<str>, HashMap<Rc<str>, EventPayloadValue>>,
+    payload: &mut HashMap<Arc<str>, EventPayloadValue>,
+    globals: &HashMap<Arc<str>, HashMap<Arc<str>, EventPayloadValue>>,
   ) -> bool {
     let payload_value = utils::extract_payload_value(payload_type, key, value);
     if payload_value.is_none() {
@@ -129,11 +129,11 @@ impl<'a> TraceXesEventLogIterator<'a> {
   }
 
   fn update_event_data(
-    key: &Rc<str>,
+    key: &Arc<str>,
     payload_value: EventPayloadValue,
     date: &mut Option<DateTime<Utc>>,
-    name: &mut Option<Rc<str>>,
-    payload: &mut HashMap<Rc<str>, EventPayloadValue>,
+    name: &mut Option<Arc<str>>,
+    payload: &mut HashMap<Arc<str>, EventPayloadValue>,
   ) {
     match key.as_ref() {
       TIME_TIMESTAMP_STR => {
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/shared.rs b/Ficus/src/rust/ficus/src/event_log/xes/shared.rs
index 2123c8ba2..38d5f2803 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/shared.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/shared.rs
@@ -1,27 +1,28 @@
 use crate::event_log::core::event::event::EventPayloadValue;
-use std::{collections::HashMap, rc::Rc};
+use std::collections::HashMap;
+use std::sync::Arc;
 
 #[derive(Debug, Clone)]
 pub struct XesEventLogExtension {
-  pub name: Rc<str>,
-  pub prefix: Rc<str>,
-  pub uri: Rc<str>,
+  pub name: Arc<str>,
+  pub prefix: Arc<str>,
+  pub uri: Arc<str>,
 }
 
 #[derive(Debug, Clone)]
 pub struct XesGlobal {
-  pub scope: Rc<str>,
-  pub default_values: HashMap<Rc<str>, EventPayloadValue>,
+  pub scope: Arc<str>,
+  pub default_values: HashMap<Arc<str>, EventPayloadValue>,
 }
 
 #[derive(Debug, Clone)]
 pub struct XesClassifier {
-  pub name: Rc<str>,
-  pub keys: Vec<Rc<str>>,
+  pub name: Arc<str>,
+  pub keys: Vec<Arc<str>>,
 }
 
 #[derive(Debug, Clone)]
 pub struct XesProperty {
-  pub name: Rc<str>,
+  pub name: Arc<str>,
   pub value: EventPayloadValue,
 }
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/simple.rs b/Ficus/src/rust/ficus/src/event_log/xes/simple.rs
index 4a15ef2f4..5e3cc4d32 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/simple.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/simple.rs
@@ -4,6 +4,7 @@ use crate::event_log::{
 };
 use chrono::Utc;
 use std::{cell::RefCell, rc::Rc};
+use std::sync::Arc;
 
 pub fn create_simple_event_log(raw_log: &Vec<Vec<&str>>) -> XesEventLogImpl {
   let mut log = XesEventLogImpl::default();
@@ -12,7 +13,7 @@ pub fn create_simple_event_log(raw_log: &Vec<Vec<&str>>) -> XesEventLogImpl {
     let mut trace = XesTraceImpl::default();
     for raw_event in raw_trace {
       trace.push(Rc::new(RefCell::new(XesEventImpl::new(
-        Rc::from(raw_event.to_string()),
+        Arc::from(raw_event.to_string()),
         Utc::now(),
       ))))
     }
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/xes_event.rs b/Ficus/src/rust/ficus/src/event_log/xes/xes_event.rs
index ec4b556a8..8d8ed22fe 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/xes_event.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/xes_event.rs
@@ -2,9 +2,8 @@ use chrono::{DateTime, Utc};
 use std::{
   collections::HashMap,
   fmt::{Debug, Formatter},
-  rc::Rc,
 };
-
+use std::sync::Arc;
 use crate::{
   event_log::core::event::{
     event::{Event, EventPayloadValue},
@@ -18,7 +17,7 @@ use crate::{
 
 pub struct XesEventImpl {
   event_base: EventBase,
-  payload: Option<HashMap<Rc<str>, EventPayloadValue>>,
+  payload: Option<HashMap<Arc<str>, EventPayloadValue>>,
 }
 
 impl Debug for XesEventImpl {
@@ -28,7 +27,7 @@ impl Debug for XesEventImpl {
 }
 
 impl XesEventImpl {
-  pub fn new_all_fields(name: Rc<str>, timestamp: DateTime<Utc>, payload: Option<HashMap<Rc<str>, EventPayloadValue>>) -> Self {
+  pub fn new_all_fields(name: Arc<str>, timestamp: DateTime<Utc>, payload: Option<HashMap<Arc<str>, EventPayloadValue>>) -> Self {
     Self {
       event_base: EventBase::new(name, timestamp),
       payload,
@@ -53,18 +52,18 @@ impl UserDataOwner for XesEventImpl {
 }
 
 impl Event for XesEventImpl {
-  fn new(name: Rc<str>, timestamp: DateTime<Utc>) -> Self {
+  fn new(name: Arc<str>, timestamp: DateTime<Utc>) -> Self {
     Self {
       event_base: EventBase::new(name, timestamp),
       payload: None,
     }
   }
 
-  fn new_with_min_date(name: Rc<str>) -> Self {
+  fn new_with_min_date(name: Arc<str>) -> Self {
     Self::new(name, DateTime::<Utc>::MIN_UTC)
   }
 
-  fn new_with_max_date(name: Rc<str>) -> Self {
+  fn new_with_max_date(name: Arc<str>) -> Self {
     Self::new(name, DateTime::<Utc>::MAX_UTC)
   }
 
@@ -72,7 +71,7 @@ impl Event for XesEventImpl {
     &self.event_base.name
   }
 
-  fn name_pointer(&self) -> &Rc<str> {
+  fn name_pointer(&self) -> &Arc<str> {
     &self.event_base.name
   }
 
@@ -80,15 +79,15 @@ impl Event for XesEventImpl {
     &self.event_base.timestamp
   }
 
-  fn payload_map(&self) -> Option<&HashMap<Rc<str>, EventPayloadValue>> {
+  fn payload_map(&self) -> Option<&HashMap<Arc<str>, EventPayloadValue>> {
     self.payload.as_ref()
   }
 
-  fn payload_map_mut(&mut self) -> Option<&mut HashMap<Rc<str>, EventPayloadValue>> {
+  fn payload_map_mut(&mut self) -> Option<&mut HashMap<Arc<str>, EventPayloadValue>> {
     self.payload.as_mut()
   }
 
-  fn ordered_payload(&self) -> Vec<(&Rc<str>, &EventPayloadValue)> {
+  fn ordered_payload(&self) -> Vec<(&Arc<str>, &EventPayloadValue)> {
     let mut payload = Vec::new();
     if let Some(payload_map) = self.payload_map() {
       for (key, value) in payload_map {
@@ -102,7 +101,7 @@ impl Event for XesEventImpl {
     }
   }
 
-  fn set_name(&mut self, new_name: Rc<str>) {
+  fn set_name(&mut self, new_name: Arc<str>) {
     self.event_base.name = new_name;
   }
 
@@ -110,7 +109,7 @@ impl Event for XesEventImpl {
     self.event_base.timestamp = new_timestamp;
   }
 
-  fn add_or_update_payload(&mut self, key: Rc<str>, value: EventPayloadValue) {
+  fn add_or_update_payload(&mut self, key: Arc<str>, value: EventPayloadValue) {
     if self.payload.is_none() {
       self.payload = Some(HashMap::new());
     }
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/xes_event_log.rs b/Ficus/src/rust/ficus/src/event_log/xes/xes_event_log.rs
index 726b49f37..98141050e 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/xes_event_log.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/xes_event_log.rs
@@ -17,18 +17,19 @@ use crate::{
   },
 };
 use std::{cell::RefCell, collections::HashMap, rc::Rc};
+use std::sync::Arc;
 
 #[derive(Default)]
 pub struct XesEventLogImpl {
   base: EventLogBase<XesTraceImpl>,
-  globals: HashMap<Rc<str>, HashMap<Rc<str>, EventPayloadValue>>,
+  globals: HashMap<Arc<str>, HashMap<Arc<str>, EventPayloadValue>>,
   extensions: Vec<XesEventLogExtension>,
   classifiers: Vec<XesClassifier>,
   properties: Vec<XesProperty>,
 }
 
 impl XesEventLogImpl {
-  pub fn globals_map(&self) -> &HashMap<Rc<str>, HashMap<Rc<str>, EventPayloadValue>> {
+  pub fn globals_map(&self) -> &HashMap<Arc<str>, HashMap<Arc<str>, EventPayloadValue>> {
     &self.globals
   }
 
@@ -44,7 +45,7 @@ impl XesEventLogImpl {
     &self.properties
   }
 
-  pub fn globals_mut(&mut self) -> &mut HashMap<Rc<str>, HashMap<Rc<str>, EventPayloadValue>> {
+  pub fn globals_mut(&mut self) -> &mut HashMap<Arc<str>, HashMap<Arc<str>, EventPayloadValue>> {
     &mut self.globals
   }
 
@@ -60,7 +61,7 @@ impl XesEventLogImpl {
     &mut self.classifiers
   }
 
-  pub fn ordered_properties(&self) -> Vec<(&Rc<str>, &EventPayloadValue)> {
+  pub fn ordered_properties(&self) -> Vec<(&Arc<str>, &EventPayloadValue)> {
     let mut properties = Vec::new();
     for property in self.properties_map() {
       properties.push((&property.name, &property.value));
@@ -70,7 +71,7 @@ impl XesEventLogImpl {
     properties
   }
 
-  pub fn ordered_globals(&self) -> Vec<(&Rc<str>, Vec<(&Rc<str>, &EventPayloadValue)>)> {
+  pub fn ordered_globals(&self) -> Vec<(&Arc<str>, Vec<(&Arc<str>, &EventPayloadValue)>)> {
     let mut globals = Vec::new();
     for (key, value) in self.globals_map() {
       let mut defaults = Vec::new();
diff --git a/Ficus/src/rust/ficus/src/features/analysis/directly_follows_graph.rs b/Ficus/src/rust/ficus/src/features/analysis/directly_follows_graph.rs
index 068ea7273..b08fcf24f 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/directly_follows_graph.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/directly_follows_graph.rs
@@ -8,6 +8,7 @@ use crate::{
 };
 use log::warn;
 use std::{collections::HashMap, rc::Rc};
+use std::sync::Arc;
 
 pub fn construct_dfg(info: &dyn EventLogInfo) -> DefaultGraph {
   let mut graph: DefaultGraph = Default::default();
@@ -23,7 +24,7 @@ pub fn construct_dfg(info: &dyn EventLogInfo) -> DefaultGraph {
       for (follower, count) in followers.iter() {
         if let Some(first_id) = classes_to_node_ids.get(class) {
           if let Some(second_id) = classes_to_node_ids.get(follower) {
-            let data = Some(Rc::from(count.to_string()));
+            let data = Some(Arc::from(count.to_string()));
             let connection_data = NodesConnectionData::new(data, *count as f64, None);
 
             graph.connect_nodes(first_id, second_id, connection_data);
@@ -47,7 +48,7 @@ pub fn construct_dfg_by_attribute(log: &XesEventLogImpl, attribute: &str) -> Def
 
   for trace in log.traces() {
     let trace = trace.borrow();
-    let mut last_seen_events: HashMap<Option<Rc<str>>, Rc<str>> = HashMap::new();
+    let mut last_seen_events: HashMap<Option<Arc<str>>, Arc<str>> = HashMap::new();
 
     for event in trace.events() {
       let event = event.borrow();
@@ -80,7 +81,7 @@ pub fn construct_dfg_by_attribute(log: &XesEventLogImpl, attribute: &str) -> Def
   }
 
   for ((first_node_id, second_node_id), count) in dfg_map {
-    let edge_data = Some(Rc::from(count.to_string()));
+    let edge_data = Some(Arc::from(count.to_string()));
     let connection_data = NodesConnectionData::new(edge_data, count as f64, None);
 
     graph.connect_nodes(&first_node_id, &second_node_id, connection_data);
diff --git a/Ficus/src/rust/ficus/src/features/analysis/entropy/dfg_entropy.rs b/Ficus/src/rust/ficus/src/features/analysis/entropy/dfg_entropy.rs
index 3f63894fd..9dee4957b 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/entropy/dfg_entropy.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/entropy/dfg_entropy.rs
@@ -12,8 +12,9 @@ use std::{
   collections::{HashMap, HashSet},
   rc::Rc,
 };
+use std::sync::Arc;
 
-pub fn calculate_laplace_dfg_entropy<TLog>(log: &TLog, ignored_events: Option<&HashSet<Rc<str>>>) -> HashMap<String, f64>
+pub fn calculate_laplace_dfg_entropy<TLog>(log: &TLog, ignored_events: Option<&HashSet<Arc<str>>>) -> HashMap<String, f64>
 where
   TLog: EventLog,
 {
@@ -24,13 +25,13 @@ where
     x / y
   };
 
-  let dfr_calculator = |first: &Rc<str>, second: &Rc<str>, log_info: &dyn EventLogInfo| {
+  let dfr_calculator = |first: &Arc<str>, second: &Arc<str>, log_info: &dyn EventLogInfo| {
     let pair_count = log_info.dfg_info().get_directly_follows_count(first, second);
     let first_count = log_info.event_count(first);
     dfr_or_dpr_calculator(pair_count, log_info.event_classes_count(), first_count)
   };
 
-  let dpr_calculator = |first: &Rc<str>, second: &Rc<str>, log_info: &dyn EventLogInfo| {
+  let dpr_calculator = |first: &Arc<str>, second: &Arc<str>, log_info: &dyn EventLogInfo| {
     let pair_count = log_info.dfg_info().get_directly_follows_count(second, first);
     let first_count = log_info.event_count(first);
     dfr_or_dpr_calculator(pair_count, log_info.event_classes_count(), first_count)
@@ -41,18 +42,18 @@ where
   calculate_dfg_entropy(&log_info, dfr_calculator, dpr_calculator)
 }
 
-pub fn calculate_default_dfg_entropy<TLog>(log: &TLog, ignored_events: Option<&HashSet<Rc<str>>>) -> HashMap<String, f64>
+pub fn calculate_default_dfg_entropy<TLog>(log: &TLog, ignored_events: Option<&HashSet<Arc<str>>>) -> HashMap<String, f64>
 where
   TLog: EventLog,
 {
-  let dfr_calculator = |first: &Rc<str>, second: &Rc<str>, log_info: &dyn EventLogInfo| {
+  let dfr_calculator = |first: &Arc<str>, second: &Arc<str>, log_info: &dyn EventLogInfo| {
     let dfg = log_info.dfg_info();
     let dfr = dfg.get_directly_follows_count(first, second);
     let first_count = log_info.event_count(first);
     dfr as f64 / first_count as f64
   };
 
-  let dpr_calculator = |first: &Rc<str>, second: &Rc<str>, log_info: &dyn EventLogInfo| {
+  let dpr_calculator = |first: &Arc<str>, second: &Arc<str>, log_info: &dyn EventLogInfo| {
     let dfg = log_info.dfg_info();
     let dfr = dfg.get_directly_follows_count(second, first);
     let first_count = log_info.event_count(first);
@@ -70,18 +71,18 @@ fn calculate_dfg_entropy<TDfrEntropyCalculator, TDprEntropyCalculator>(
   dpr_calculator: TDprEntropyCalculator,
 ) -> HashMap<String, f64>
 where
-  TDfrEntropyCalculator: Fn(&Rc<str>, &Rc<str>, &dyn EventLogInfo) -> f64,
-  TDprEntropyCalculator: Fn(&Rc<str>, &Rc<str>, &dyn EventLogInfo) -> f64,
+  TDfrEntropyCalculator: Fn(&Arc<str>, &Arc<str>, &dyn EventLogInfo) -> f64,
+  TDprEntropyCalculator: Fn(&Arc<str>, &Arc<str>, &dyn EventLogInfo) -> f64,
 {
   let mut entropy = HashMap::new();
   let events_names = &log_info.all_event_classes();
 
   let mut dfr_events_names = events_names.clone();
-  let fake_end = Rc::<str>::from(FAKE_EVENT_END_NAME);
+  let fake_end = Arc::<str>::from(FAKE_EVENT_END_NAME);
   dfr_events_names.push(&fake_end);
 
   let mut dpr_events_names = events_names.clone();
-  let fake_start = Rc::<str>::from(FAKE_EVENT_START_NAME.to_string());
+  let fake_start = Arc::<str>::from(FAKE_EVENT_START_NAME.to_string());
   dpr_events_names.push(&fake_start);
 
   for event_name in events_names {
diff --git a/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy.rs b/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy.rs
index fd7f29e5f..d66ed78f3 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy.rs
@@ -1,19 +1,18 @@
 use crate::event_log::core::{event::event::Event, event_log::EventLog, trace::trace::Trace};
 use std::{
   collections::{HashMap, HashSet},
-  rc::Rc,
 };
-
+use std::sync::Arc;
 use super::shared::{calculate_entropies, calculate_max_vector_length, calculate_pos_entropy};
 
-pub fn calculate_pos_entropies<TLog>(log: &TLog, ignored_events: &Option<HashSet<Rc<str>>>) -> HashMap<Rc<str>, f64>
+pub fn calculate_pos_entropies<TLog>(log: &TLog, ignored_events: &Option<HashSet<Arc<str>>>) -> HashMap<Arc<str>, f64>
 where
   TLog: EventLog,
 {
   calculate_entropies(log, ignored_events.as_ref(), calculate_pos_entropy_for_event)
 }
 
-pub fn calculate_pos_entropy_for_event<TLog>(log: &TLog, event_name: &str, ignored_events: Option<&HashSet<Rc<str>>>) -> f64
+pub fn calculate_pos_entropy_for_event<TLog>(log: &TLog, event_name: &str, ignored_events: Option<&HashSet<Arc<str>>>) -> f64
 where
   TLog: EventLog,
 {
diff --git a/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy_fast.rs b/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy_fast.rs
index 8d817f4ef..367a2342a 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy_fast.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy_fast.rs
@@ -4,19 +4,18 @@ use crate::event_log::core::{
 };
 use std::{
   collections::{HashMap, HashSet},
-  rc::Rc,
 };
-
+use std::sync::Arc;
 use super::shared::{calculate_entropies, calculate_max_vector_length, calculate_pos_entropy};
 
-pub fn calculate_pos_entropies_fast<TLog>(log: &TLog, ignored_events: Option<&HashSet<Rc<str>>>) -> HashMap<Rc<str>, f64>
+pub fn calculate_pos_entropies_fast<TLog>(log: &TLog, ignored_events: Option<&HashSet<Arc<str>>>) -> HashMap<Arc<str>, f64>
 where
   TLog: EventLog,
 {
   calculate_entropies(log, ignored_events, calculate_pos_entropy_for_event_fast)
 }
 
-pub fn calculate_pos_entropy_for_event_fast<TLog>(log: &TLog, name: &str, ignored_events: Option<&HashSet<Rc<str>>>) -> f64
+pub fn calculate_pos_entropy_for_event_fast<TLog>(log: &TLog, name: &str, ignored_events: Option<&HashSet<Arc<str>>>) -> f64
 where
   TLog: EventLog,
 {
diff --git a/Ficus/src/rust/ficus/src/features/analysis/entropy/shared.rs b/Ficus/src/rust/ficus/src/features/analysis/entropy/shared.rs
index 28d8f0f45..cc3c37ccb 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/entropy/shared.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/entropy/shared.rs
@@ -10,10 +10,10 @@ use crate::{
 };
 use std::{
   collections::{HashMap, HashSet},
-  rc::Rc,
 };
+use std::sync::Arc;
 
-pub fn calculate_max_vector_length<TLog>(log: &TLog, ignored_events: Option<&HashSet<Rc<str>>>) -> usize
+pub fn calculate_max_vector_length<TLog>(log: &TLog, ignored_events: Option<&HashSet<Arc<str>>>) -> usize
 where
   TLog: EventLog,
 {
@@ -23,7 +23,7 @@ where
   }
 }
 
-fn calculate_vector_length_with_ignored_events<TLog>(log: &TLog, ignored_events: &HashSet<Rc<str>>) -> usize
+fn calculate_vector_length_with_ignored_events<TLog>(log: &TLog, ignored_events: &HashSet<Arc<str>>) -> usize
 where
   TLog: EventLog,
 {
@@ -78,12 +78,12 @@ pub fn calculate_pos_entropy(probabilities: &mut [f64], traces_count: f64) -> f6
 
 pub fn calculate_entropies<TLog, TEntropyCalculator>(
   log: &TLog,
-  ignored_events: Option<&HashSet<Rc<str>>>,
+  ignored_events: Option<&HashSet<Arc<str>>>,
   entropy_calculator: TEntropyCalculator,
-) -> HashMap<Rc<str>, f64>
+) -> HashMap<Arc<str>, f64>
 where
   TLog: EventLog,
-  TEntropyCalculator: Fn(&TLog, &str, Option<&HashSet<Rc<str>>>) -> f64,
+  TEntropyCalculator: Fn(&TLog, &str, Option<&HashSet<Arc<str>>>) -> f64,
 {
   let log_info = OfflineEventLogInfo::create_from(EventLogInfoCreationDto::default(log));
   let mut entropies = HashMap::new();
diff --git a/Ficus/src/rust/ficus/src/features/analysis/log_info/dfg_info.rs b/Ficus/src/rust/ficus/src/features/analysis/log_info/dfg_info.rs
index a15f2bb54..540829c3c 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/log_info/dfg_info.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/log_info/dfg_info.rs
@@ -1,27 +1,27 @@
 use std::{
   collections::{HashMap, HashSet},
-  rc::Rc,
 };
+use std::sync::Arc;
 
 pub trait DfgInfo {
   fn get_directly_follows_count(&self, first: &str, second: &str) -> usize;
   fn is_in_directly_follows_relation(&self, left: &str, right: &str) -> bool;
-  fn get_followed_events(&self, event_class: &str) -> Option<&HashMap<Rc<str>, usize>>;
-  fn get_precedes_events(&self, event_class: &str) -> Option<&HashMap<Rc<str>, usize>>;
+  fn get_followed_events(&self, event_class: &str) -> Option<&HashMap<Arc<str>, usize>>;
+  fn get_precedes_events(&self, event_class: &str) -> Option<&HashMap<Arc<str>, usize>>;
   fn is_event_with_single_follower(&self, event_class: &str) -> bool;
 }
 
 #[derive(Debug)]
 pub struct OfflineDfgInfo {
-  pub(super) followed_events: HashMap<Rc<str>, HashMap<Rc<str>, usize>>,
-  pub(super) precedes_events: HashMap<Rc<str>, HashMap<Rc<str>, usize>>,
-  pub(super) events_with_single_follower: HashSet<Rc<str>>,
+  pub(super) followed_events: HashMap<Arc<str>, HashMap<Arc<str>, usize>>,
+  pub(super) precedes_events: HashMap<Arc<str>, HashMap<Arc<str>, usize>>,
+  pub(super) events_with_single_follower: HashSet<Arc<str>>,
 }
 
 impl OfflineDfgInfo {
-  pub fn create_from_relations(relations: &HashMap<(Rc<str>, Rc<str>), u64>) -> OfflineDfgInfo {
-    let mut followed_events: HashMap<Rc<str>, HashMap<Rc<str>, usize>> = HashMap::new();
-    let mut precedes_events: HashMap<Rc<str>, HashMap<Rc<str>, usize>> = HashMap::new();
+  pub fn create_from_relations(relations: &HashMap<(Arc<str>, Arc<str>), u64>) -> OfflineDfgInfo {
+    let mut followed_events: HashMap<Arc<str>, HashMap<Arc<str>, usize>> = HashMap::new();
+    let mut precedes_events: HashMap<Arc<str>, HashMap<Arc<str>, usize>> = HashMap::new();
     let mut events_with_single_follower = HashSet::new();
 
     for (relation, count) in relations {
@@ -69,14 +69,14 @@ impl DfgInfo for OfflineDfgInfo {
     }
   }
 
-  fn get_followed_events(&self, event_class: &str) -> Option<&HashMap<Rc<str>, usize>> {
+  fn get_followed_events(&self, event_class: &str) -> Option<&HashMap<Arc<str>, usize>> {
     match self.followed_events.get(event_class) {
       Some(followers_counts) => Some(followers_counts),
       None => None,
     }
   }
 
-  fn get_precedes_events(&self, event_class: &str) -> Option<&HashMap<Rc<str>, usize>> {
+  fn get_precedes_events(&self, event_class: &str) -> Option<&HashMap<Arc<str>, usize>> {
     match self.precedes_events.get(event_class) {
       Some(followers_counts) => Some(followers_counts),
       None => None,
diff --git a/Ficus/src/rust/ficus/src/features/analysis/log_info/event_log_info.rs b/Ficus/src/rust/ficus/src/features/analysis/log_info/event_log_info.rs
index 679e4adcb..569b58c8e 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/log_info/event_log_info.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/log_info/event_log_info.rs
@@ -18,6 +18,7 @@ use std::{
   ops::Deref,
   rc::Rc,
 };
+use std::sync::Arc;
 
 pub trait EventLogCounts {
   fn traces_count(&self) -> usize;
@@ -44,21 +45,21 @@ pub trait EventLogInfo {
   fn event_classes_count(&self) -> u64;
   fn event_count(&self, event_class: &str) -> u64;
   fn dfg_info(&self) -> &dyn DfgInfo;
-  fn all_event_classes(&self) -> Vec<&Rc<str>>;
-  fn start_event_classes(&self) -> &HashSet<Rc<str>>;
-  fn end_event_classes(&self) -> &HashSet<Rc<str>>;
+  fn all_event_classes(&self) -> Vec<&Arc<str>>;
+  fn start_event_classes(&self) -> &HashSet<Arc<str>>;
+  fn end_event_classes(&self) -> &HashSet<Arc<str>>;
 }
 
 pub struct OfflineEventLogInfo {
   counts: Option<EventLogCountsImpl>,
-  event_classes_counts: HashMap<Rc<str>, u64>,
+  event_classes_counts: HashMap<Arc<str>, u64>,
   dfg_info: OfflineDfgInfo,
-  start_event_classes: HashSet<Rc<str>>,
-  end_event_classes: HashSet<Rc<str>>,
+  start_event_classes: HashSet<Arc<str>>,
+  end_event_classes: HashSet<Arc<str>>,
 }
 
 impl OfflineEventLogInfo {
-  pub fn create_from_relations(relations: &HashMap<(Rc<str>, Rc<str>), u64>, event_classes_count: &HashMap<Rc<str>, u64>) -> Self {
+  pub fn create_from_relations(relations: &HashMap<(Arc<str>, Arc<str>), u64>, event_classes_count: &HashMap<Arc<str>, u64>) -> Self {
     let dfg_info = OfflineDfgInfo::create_from_relations(relations);
 
     let start_event_classes = event_classes_count
@@ -102,17 +103,17 @@ impl OfflineEventLogInfo {
       log = new_log.as_ref().unwrap();
     }
 
-    let mut dfg_pairs: HashMap<Rc<str>, HashMap<Rc<str>, usize>> = HashMap::new();
+    let mut dfg_pairs: HashMap<Arc<str>, HashMap<Arc<str>, usize>> = HashMap::new();
     let mut events_count = 0;
     let mut events_counts = HashMap::new();
     let mut start_event_classes = HashSet::new();
     let mut end_event_classes = HashSet::new();
 
-    let mut update_events_counts = |event_name: &Rc<str>| {
+    let mut update_events_counts = |event_name: &Arc<str>| {
       increase_in_map(&mut events_counts, event_name);
     };
 
-    let mut update_pairs_count = |first_name: &Rc<str>, second_name: &Rc<str>| {
+    let mut update_pairs_count = |first_name: &Arc<str>, second_name: &Arc<str>| {
       if let Some(values) = dfg_pairs.get_mut(first_name) {
         if let Some(count) = values.get_mut(second_name) {
           *count += 1;
@@ -125,8 +126,8 @@ impl OfflineEventLogInfo {
       }
     };
 
-    let fake_start_name = Rc::<str>::from(FAKE_EVENT_START_NAME);
-    let fake_end_name = Rc::<str>::from(FAKE_EVENT_END_NAME);
+    let fake_start_name = Arc::<str>::from(FAKE_EVENT_START_NAME);
+    let fake_end_name = Arc::<str>::from(FAKE_EVENT_END_NAME);
 
     for trace in log.traces() {
       let trace = trace.borrow();
@@ -170,7 +171,7 @@ impl OfflineEventLogInfo {
       }
     }
 
-    let mut precedes_events: HashMap<Rc<str>, HashMap<Rc<str>, usize>> = HashMap::new();
+    let mut precedes_events: HashMap<Arc<str>, HashMap<Arc<str>, usize>> = HashMap::new();
     let mut events_with_single_follower = HashSet::new();
 
     for (first, followers_map) in &dfg_pairs {
@@ -210,7 +211,7 @@ pub fn create_threads_log_by_attribute<TLog: EventLog>(log: &TLog, thread_attrib
 
   for trace in log.traces() {
     let trace = trace.borrow();
-    let mut threads_traces = HashMap::<Option<Rc<str>>, TLog::TTrace>::new();
+    let mut threads_traces = HashMap::<Option<Arc<str>>, TLog::TTrace>::new();
 
     for event in trace.events() {
       let thread_id = extract_thread_id(event.borrow().deref(), thread_attribute);
@@ -255,15 +256,15 @@ impl EventLogInfo for OfflineEventLogInfo {
     &self.dfg_info
   }
 
-  fn all_event_classes(&self) -> Vec<&Rc<str>> {
+  fn all_event_classes(&self) -> Vec<&Arc<str>> {
     self.event_classes_counts.keys().collect()
   }
 
-  fn start_event_classes(&self) -> &HashSet<Rc<str>> {
+  fn start_event_classes(&self) -> &HashSet<Arc<str>> {
     &self.start_event_classes
   }
 
-  fn end_event_classes(&self) -> &HashSet<Rc<str>> {
+  fn end_event_classes(&self) -> &HashSet<Arc<str>> {
     &self.end_event_classes
   }
 }
diff --git a/Ficus/src/rust/ficus/src/features/analysis/log_info/log_info_creation_dto.rs b/Ficus/src/rust/ficus/src/features/analysis/log_info/log_info_creation_dto.rs
index 171d0b418..8449aa8c2 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/log_info/log_info_creation_dto.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/log_info/log_info_creation_dto.rs
@@ -1,5 +1,6 @@
 use crate::event_log::core::event_log::EventLog;
-use std::{collections::HashSet, rc::Rc};
+use std::collections::HashSet;
+use std::sync::Arc;
 
 pub struct EventLogInfoCreationDto<'a, TLog>
 where
@@ -7,8 +8,8 @@ where
 {
   pub(super) log: &'a TLog,
   pub(super) add_fake_start_end_events: bool,
-  pub(super) ignored_events: Option<&'a HashSet<Rc<str>>>,
-  pub(super) thread_attribute: Option<Rc<str>>,
+  pub(super) ignored_events: Option<&'a HashSet<Arc<str>>>,
+  pub(super) thread_attribute: Option<Arc<str>>,
 }
 
 impl<'a, TLog> EventLogInfoCreationDto<'a, TLog>
@@ -33,7 +34,7 @@ where
     }
   }
 
-  pub fn default_fake_ignored(log: &'a TLog, ignored_events: Option<&'a HashSet<Rc<str>>>) -> Self {
+  pub fn default_fake_ignored(log: &'a TLog, ignored_events: Option<&'a HashSet<Arc<str>>>) -> Self {
     Self {
       log,
       add_fake_start_end_events: true,
@@ -42,7 +43,7 @@ where
     }
   }
 
-  pub fn default_ignore(log: &'a TLog, ignored_events: &'a HashSet<Rc<str>>) -> Self {
+  pub fn default_ignore(log: &'a TLog, ignored_events: &'a HashSet<Arc<str>>) -> Self {
     Self {
       log,
       add_fake_start_end_events: false,
@@ -51,7 +52,7 @@ where
     }
   }
 
-  pub fn default_thread(log: &'a TLog, thread_attribute: Rc<str>) -> Self {
+  pub fn default_thread(log: &'a TLog, thread_attribute: Arc<str>) -> Self {
     Self {
       log,
       add_fake_start_end_events: false,
diff --git a/Ficus/src/rust/ficus/src/features/analysis/patterns/activity_instances.rs b/Ficus/src/rust/ficus/src/features/analysis/patterns/activity_instances.rs
index da46a9b61..9ea66d8da 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/patterns/activity_instances.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/patterns/activity_instances.rs
@@ -24,6 +24,7 @@ use std::{
   rc::Rc,
   str::FromStr,
 };
+use std::sync::Arc;
 
 #[derive(Debug, Clone, Getters, MutGetters, new)]
 pub struct ActivityInTraceInfo {
@@ -496,7 +497,7 @@ where
       for event in &underlying_events {
         execute_with_underlying_events(event, &mut |event| {
           let payload_value = EventPayloadValue::String(activity.node.borrow().id().clone());
-          let key = Rc::from(format!("hierarchy_level_{}", level));
+          let key = Arc::from(format!("hierarchy_level_{}", level));
           event.add_or_update_payload(key, payload_value);
         })
       }
@@ -586,15 +587,15 @@ where
 
 pub fn create_logs_for_activities(
   activities_source: &ActivitiesLogSource<XesEventLogImpl>,
-) -> HashMap<Rc<str>, Rc<RefCell<XesEventLogImpl>>> {
+) -> HashMap<Arc<str>, Rc<RefCell<XesEventLogImpl>>> {
   match activities_source {
     ActivitiesLogSource::Log(log) => create_activities_logs_from_log(log),
     ActivitiesLogSource::TracesActivities(log, activities, level) => create_log_from_traces_activities(log, activities, *level),
   }
 }
 
-fn create_activities_logs_from_log(log: &XesEventLogImpl) -> HashMap<Rc<str>, Rc<RefCell<XesEventLogImpl>>> {
-  let mut activities_to_logs: HashMap<Rc<str>, Rc<RefCell<XesEventLogImpl>>> = HashMap::new();
+fn create_activities_logs_from_log(log: &XesEventLogImpl) -> HashMap<Arc<str>, Rc<RefCell<XesEventLogImpl>>> {
+  let mut activities_to_logs: HashMap<Arc<str>, Rc<RefCell<XesEventLogImpl>>> = HashMap::new();
 
   for trace in log.traces() {
     for event in trace.borrow().events() {
@@ -626,8 +627,8 @@ fn create_log_from_traces_activities<TLog: EventLog>(
   log: &TLog,
   activities: &[Vec<ActivityInTraceInfo>],
   activity_level: usize,
-) -> HashMap<Rc<str>, Rc<RefCell<TLog>>> {
-  let mut activities_to_logs: HashMap<Rc<str>, Rc<RefCell<TLog>>> = HashMap::new();
+) -> HashMap<Arc<str>, Rc<RefCell<TLog>>> {
+  let mut activities_to_logs: HashMap<Arc<str>, Rc<RefCell<TLog>>> = HashMap::new();
   for (trace_activities, trace) in activities.iter().zip(log.traces()) {
     let activity_handler = |activity_info: &ActivityInTraceInfo| {
       if activity_level != *activity_info.node.borrow().level() {
diff --git a/Ficus/src/rust/ficus/src/features/analysis/patterns/entry_points.rs b/Ficus/src/rust/ficus/src/features/analysis/patterns/entry_points.rs
index 42854c2d0..05ac83953 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/patterns/entry_points.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/patterns/entry_points.rs
@@ -1,5 +1,5 @@
 use std::{cell::RefCell, collections::HashMap, rc::Rc};
-
+use std::sync::Arc;
 use super::{
   activity_instances::{self, ActivityInTraceInfo, create_new_log_from_activities_instances, extract_activities_instances},
   contexts::{ActivitiesDiscoveryContext, ActivitiesInstancesDiscoveryContext, PatternsDiscoveryContext},
@@ -111,7 +111,7 @@ where
 pub fn create_logs_for_activities<TClassExtractor, TNameCreator>(
   context: &ActivitiesDiscoveryContext<TClassExtractor, TNameCreator>,
   activity_level: usize,
-) -> HashMap<Rc<str>, Rc<RefCell<XesEventLogImpl>>>
+) -> HashMap<Arc<str>, Rc<RefCell<XesEventLogImpl>>>
 where
   TClassExtractor: Fn(&XesEventImpl) -> u64,
   TNameCreator: Fn(&SubArrayWithTraceIndex) -> String,
diff --git a/Ficus/src/rust/ficus/src/features/analysis/patterns/repeat_sets.rs b/Ficus/src/rust/ficus/src/features/analysis/patterns/repeat_sets.rs
index 20ffe5406..ca5dabd13 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/patterns/repeat_sets.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/patterns/repeat_sets.rs
@@ -6,7 +6,7 @@ use std::{
   rc::Rc,
   sync::atomic::{AtomicU64, Ordering},
 };
-
+use std::sync::Arc;
 use super::tandem_arrays::SubArrayInTraceInfo;
 
 #[derive(Clone, Copy, Debug)]
@@ -79,7 +79,7 @@ pub fn build_repeat_sets(log: &[Vec<u64>], patterns: &[Vec<SubArrayInTraceInfo>]
 #[derive(Debug, Getters)]
 pub struct ActivityNode {
   #[getset(get = "pub")]
-  id: Rc<str>,
+  id: Arc<str>,
   #[getset(get = "pub")]
   repeat_set: Option<SubArrayWithTraceIndex>,
   #[getset(get = "pub")]
@@ -89,7 +89,7 @@ pub struct ActivityNode {
   #[getset(get = "pub")]
   level: usize,
   #[getset(get = "pub")]
-  name: Rc<str>,
+  name: Arc<str>,
   #[getset(get = "pub")]
   pattern_kind: UnderlyingPatternKind,
 }
@@ -100,13 +100,13 @@ impl ActivityNode {
     event_classes: HashSet<u64>,
     children: Vec<Rc<RefCell<ActivityNode>>>,
     level: usize,
-    name: Rc<str>,
+    name: Arc<str>,
     pattern_kind: UnderlyingPatternKind,
   ) -> Self {
     static NEXT_ID: AtomicU64 = AtomicU64::new(0);
 
     Self {
-      id: Rc::from(format!("Activity_{}", NEXT_ID.fetch_add(1, Ordering::SeqCst))),
+      id: Arc::from(format!("Activity_{}", NEXT_ID.fetch_add(1, Ordering::SeqCst))),
       repeat_set,
       event_classes,
       children,
@@ -158,7 +158,7 @@ where
       events_set,
       vec![],
       activity_level,
-      Rc::from(name_creator(repeat_set)),
+      Arc::from(name_creator(repeat_set)),
       pattern_kind,
     )))
   };
diff --git a/Ficus/src/rust/ficus/src/features/analysis/patterns/strict_loops.rs b/Ficus/src/rust/ficus/src/features/analysis/patterns/strict_loops.rs
index bd90da8e7..211156bac 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/patterns/strict_loops.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/patterns/strict_loops.rs
@@ -12,6 +12,7 @@ use crate::{
   utils::display_name::get_display_name,
 };
 use std::{cell::RefCell, collections::HashSet, rc::Rc};
+use std::sync::Arc;
 
 pub fn find_loops_strict(log: &XesEventLogImpl, hashed_log: &Vec<Vec<u64>>, max_array_length: usize) -> Vec<Vec<ActivityInTraceInfo>> {
   find_tandem_arrays_strict(hashed_log, max_array_length)
@@ -86,7 +87,7 @@ fn create_strict_loop_activity_instance(
       HashSet::from_iter(hashed_trace[array.start_index..array.start_index + array.length].iter().copied()),
       vec![],
       0,
-      Rc::from(format!("Loop[{}]", name.join("::"))),
+      Arc::from(format!("Loop[{}]", name.join("::"))),
       UnderlyingPatternKind::StrictLoop,
     ))),
     array.start_index,
diff --git a/Ficus/src/rust/ficus/src/features/cases/mod.rs b/Ficus/src/rust/ficus/src/features/cases/mod.rs
index fcc5692f2..4dfe77f27 100644
--- a/Ficus/src/rust/ficus/src/features/cases/mod.rs
+++ b/Ficus/src/rust/ficus/src/features/cases/mod.rs
@@ -1,9 +1,9 @@
-use std::rc::Rc;
+use std::sync::Arc;
 
 #[derive(Clone, Debug)]
 pub struct CaseName {
-  pub display_name: Rc<str>,
-  pub name_parts: Vec<Rc<str>>,
+  pub display_name: Arc<str>,
+  pub name_parts: Vec<Arc<str>>,
 }
 
 impl CaseName {
diff --git a/Ficus/src/rust/ficus/src/features/clustering/activities/activities_common.rs b/Ficus/src/rust/ficus/src/features/clustering/activities/activities_common.rs
index 2862ec66e..b10767b58 100644
--- a/Ficus/src/rust/ficus/src/features/clustering/activities/activities_common.rs
+++ b/Ficus/src/rust/ficus/src/features/clustering/activities/activities_common.rs
@@ -4,7 +4,7 @@ use std::{
   rc::Rc,
   vec,
 };
-
+use std::sync::Arc;
 use linfa::DatasetBase;
 use ndarray::Array2;
 
@@ -146,7 +146,7 @@ fn create_activities_repr_from_subtraces(
 
 fn create_dataset_internal(
   traces_activities: &TracesActivities,
-  class_extractor: Option<Rc<str>>,
+  class_extractor: Option<Arc<str>>,
   activities_repr_fullfiller: impl Fn(
     &Vec<Vec<ActivityInTraceInfo>>,
     Option<&RegexEventHasher>,
diff --git a/Ficus/src/rust/ficus/src/features/clustering/activities/merging.rs b/Ficus/src/rust/ficus/src/features/clustering/activities/merging.rs
index 1c4524caf..40c799394 100644
--- a/Ficus/src/rust/ficus/src/features/clustering/activities/merging.rs
+++ b/Ficus/src/rust/ficus/src/features/clustering/activities/merging.rs
@@ -3,7 +3,7 @@ use std::{
   collections::{HashMap, HashSet},
   rc::Rc,
 };
-
+use std::sync::Arc;
 use ndarray::Array1;
 
 use crate::{
@@ -73,7 +73,7 @@ pub(super) fn merge_activities(
       new_event_classes_set,
       vec![],
       *cluster_activities[0].borrow().level(),
-      Rc::from(new_activity_name),
+      Arc::from(new_activity_name),
       *cluster_activities.first().unwrap().borrow().pattern_kind(),
     );
 
diff --git a/Ficus/src/rust/ficus/src/features/clustering/common.rs b/Ficus/src/rust/ficus/src/features/clustering/common.rs
index d788fbaaa..2fa37b808 100644
--- a/Ficus/src/rust/ficus/src/features/clustering/common.rs
+++ b/Ficus/src/rust/ficus/src/features/clustering/common.rs
@@ -1,7 +1,6 @@
 use linfa::Dataset;
 use ndarray::{Array1, Ix1};
-use std::rc::Rc;
-
+use std::sync::Arc;
 use crate::{
   event_log::xes::xes_event_log::XesEventLogImpl,
   utils::{
@@ -16,7 +15,7 @@ pub(super) type ClusteredDataset = Dataset<f64, usize, Ix1>;
 pub struct CommonVisualizationParams<'a> {
   pub log: &'a XesEventLogImpl,
   pub colors_holder: &'a mut ColorsHolder,
-  pub class_extractor: Option<Rc<str>>,
+  pub class_extractor: Option<Arc<str>>,
 }
 
 pub fn transform_to_ficus_dataset(dataset: &MyDataset, processed: Vec<String>, classes_names: Vec<String>) -> FicusDataset {
@@ -61,8 +60,8 @@ pub fn scale_raw_dataset_min_max(vector: &mut [f64], objects_count: usize, featu
   }
 }
 
-pub fn create_cluster_name(cluster_index: usize) -> Rc<str> {
-  Rc::from(format!("CLUSTER_{}", cluster_index))
+pub fn create_cluster_name(cluster_index: usize) -> Arc<str> {
+  Arc::from(format!("CLUSTER_{}", cluster_index))
 }
 
 pub(super) fn adjust_dbscan_labels(clusters: Array1<Option<usize>>, put_noise_events_in_one_cluster: bool) -> Vec<usize> {
diff --git a/Ficus/src/rust/ficus/src/features/clustering/traces/common.rs b/Ficus/src/rust/ficus/src/features/clustering/traces/common.rs
index 27ad1a702..d7821c75a 100644
--- a/Ficus/src/rust/ficus/src/features/clustering/traces/common.rs
+++ b/Ficus/src/rust/ficus/src/features/clustering/traces/common.rs
@@ -35,6 +35,7 @@ use std::{
   collections::{HashMap, HashSet},
   rc::Rc,
 };
+use std::sync::Arc;
 
 pub fn do_clusterize_log_by_traces(
   params: &mut TracesClusteringParams,
@@ -82,7 +83,7 @@ pub fn do_clusterize_log_by_traces(
 fn create_traces_dataset(
   log: &XesEventLogImpl,
   distance: &FicusDistance,
-  class_extractor: Option<&Rc<str>>,
+  class_extractor: Option<&Arc<str>>,
   feature_count_kind: FeatureCountKind,
   trace_repr_source: &TracesRepresentationSource,
 ) -> Result<(MyDataset, Vec<String>, Vec<String>), ClusteringError> {
@@ -98,7 +99,7 @@ fn create_traces_dataset(
 
 fn create_traces_dataset_default(
   log: &XesEventLogImpl,
-  class_extractor: Option<&Rc<str>>,
+  class_extractor: Option<&Arc<str>>,
   feature_count_kind: FeatureCountKind,
   trace_repr_source: &TracesRepresentationSource,
 ) -> Result<(MyDataset, Vec<String>, Vec<String>), ClusteringError> {
@@ -135,7 +136,7 @@ fn create_trace_representation(trace: &XesTraceImpl, trace_repr_source: &TracesR
 
 fn create_traces_dataset_default_internal<TLog: EventLog>(
   log: &TLog,
-  class_extractor: Option<&Rc<str>>,
+  class_extractor: Option<&Arc<str>>,
   feature_count_kind: FeatureCountKind,
   trace_repr_creator: impl Fn(&TLog::TTrace) -> Vec<Rc<RefCell<TLog::TEvent>>>,
 ) -> Result<(MyDataset, Vec<String>, Vec<String>), ClusteringError> {
@@ -216,7 +217,7 @@ fn create_traces_dataset_default_internal<TLog: EventLog>(
 
 fn create_traces_dataset_levenshtein(
   log: &XesEventLogImpl,
-  class_extractor: Option<&Rc<str>>,
+  class_extractor: Option<&Arc<str>>,
   trace_repr_source: &TracesRepresentationSource,
 ) -> Result<(MyDataset, Vec<String>, Vec<String>), ClusteringError> {
   create_traces_dataset_levenshtein_internal(log, class_extractor, |trace| create_trace_representation(trace, trace_repr_source))
@@ -224,7 +225,7 @@ fn create_traces_dataset_levenshtein(
 
 fn create_traces_dataset_levenshtein_internal<TLog: EventLog>(
   log: &TLog,
-  class_extractor: Option<&Rc<str>>,
+  class_extractor: Option<&Arc<str>>,
   trace_repr_creator: impl Fn(&TLog::TTrace) -> Vec<Rc<RefCell<TLog::TEvent>>>,
 ) -> Result<(MyDataset, Vec<String>, Vec<String>), ClusteringError> {
   let regex_hasher = class_extractor
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha.rs
index 590d72b54..84b9f5961 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha.rs
@@ -22,9 +22,9 @@ use crate::{
 use lazy_static::lazy_static;
 use std::{
   collections::{HashMap, HashSet},
-  rc::Rc,
   string::ToString,
 };
+use std::sync::Arc;
 
 const ALPHA_SET: &str = "alpha_set";
 context_key! { ALPHA_SET, AlphaSet }
@@ -127,7 +127,7 @@ fn add_alpha_plus_plus_transitions(provider: &impl AlphaPlusRelationsProvider, p
   }
 }
 
-pub fn find_transitions_one_length_loop(log: &impl EventLog) -> HashSet<Rc<str>> {
+pub fn find_transitions_one_length_loop(log: &impl EventLog) -> HashSet<Arc<str>> {
   let mut one_loop_transitions = HashSet::new();
   for trace in log.traces() {
     let trace = trace.borrow();
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc.rs
index 8700a2ee4..1acf41ef9 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc.rs
@@ -20,8 +20,8 @@ use crate::{
 };
 use std::{
   collections::{HashMap, HashSet, VecDeque},
-  rc::Rc,
 };
+use std::sync::Arc;
 
 pub fn discover_petri_net_alpha_plus_plus_nfc<TLog: EventLog>(log: &TLog) -> DefaultPetriNet {
   let one_length_loop_transitions = find_transitions_one_length_loop(log);
@@ -165,7 +165,7 @@ pub fn discover_petri_net_alpha_plus_plus_nfc<TLog: EventLog>(log: &TLog) -> Def
   });
 
   let mut p_w = HashSet::new();
-  let check_should_add_to_pw = |two_sets: &TwoSets<Rc<str>>| {
+  let check_should_add_to_pw = |two_sets: &TwoSets<Arc<str>>| {
     for l_w_item in &l_w {
       if l_w_item.a_classes().eq(two_sets.first_set()) && l_w_item.b_classes().eq(two_sets.second_set()) {
         return false;
@@ -214,7 +214,7 @@ pub fn discover_petri_net_alpha_plus_plus_nfc<TLog: EventLog>(log: &TLog) -> Def
 }
 
 fn eliminate_by_reduction_rule_1<TLog: EventLog>(
-  w2_relations: &mut HashSet<(&Rc<str>, &Rc<str>)>,
+  w2_relations: &mut HashSet<(&Arc<str>, &Arc<str>)>,
   provider: &mut AlphaPlusNfcRelationsProvider<TLog>,
   petri_net: &DefaultPetriNet,
   info: &OfflineEventLogInfo,
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc_triple.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc_triple.rs
index 241ebd86b..50329e24d 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc_triple.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc_triple.rs
@@ -6,21 +6,21 @@ use crate::{
   },
   utils::{hash_utils::compare_based_on_hashes, sets::two_sets::TwoSets},
 };
-use std::rc::Rc;
 pub use std::{
   collections::BTreeSet,
   fmt::Display,
   hash::{Hash, Hasher},
 };
+use std::sync::Arc;
 
 pub(crate) struct AlphaPlusPlusNfcTriple {
-  a_classes: BTreeSet<Rc<str>>,
-  b_classes: BTreeSet<Rc<str>>,
-  c_classes: BTreeSet<Rc<str>>,
+  a_classes: BTreeSet<Arc<str>>,
+  b_classes: BTreeSet<Arc<str>>,
+  c_classes: BTreeSet<Arc<str>>,
 }
 
 impl AlphaPlusPlusNfcTriple {
-  pub fn new(a_class: Rc<str>, b_class: Rc<str>, c_class: Rc<str>) -> Self {
+  pub fn new(a_class: Arc<str>, b_class: Arc<str>, c_class: Arc<str>) -> Self {
     Self {
       a_classes: BTreeSet::from_iter(vec![a_class]),
       b_classes: BTreeSet::from_iter(vec![b_class]),
@@ -29,9 +29,9 @@ impl AlphaPlusPlusNfcTriple {
   }
 
   pub fn try_new<TLog: EventLog>(
-    a_class: Rc<str>,
-    b_class: Rc<str>,
-    c_class: Rc<str>,
+    a_class: Arc<str>,
+    b_class: Arc<str>,
+    c_class: Arc<str>,
     provider: &AlphaPlusNfcRelationsProvider<'_, TLog>,
   ) -> Option<Self> {
     let candidate = Self::new(a_class, b_class, c_class);
@@ -43,7 +43,7 @@ impl AlphaPlusPlusNfcTriple {
 
   pub fn try_merge<TLog: EventLog>(first: &Self, second: &Self, provider: &AlphaPlusNfcRelationsProvider<'_, TLog>) -> Option<Self> {
     let merge_sets =
-      |first: &BTreeSet<Rc<str>>, second: &BTreeSet<Rc<str>>| -> BTreeSet<Rc<str>> { first.iter().chain(second.iter()).cloned().collect() };
+      |first: &BTreeSet<Arc<str>>, second: &BTreeSet<Arc<str>>| -> BTreeSet<Arc<str>> { first.iter().chain(second.iter()).cloned().collect() };
 
     let new_triple = Self {
       a_classes: merge_sets(&first.a_classes, &second.a_classes),
@@ -83,25 +83,25 @@ impl AlphaPlusPlusNfcTriple {
     true
   }
 
-  pub fn two_sets(&self) -> TwoSets<Rc<str>> {
+  pub fn two_sets(&self) -> TwoSets<Arc<str>> {
     let first = self.a_classes.iter().chain(self.c_classes.iter());
     let second = self.b_classes.iter().chain(self.c_classes.iter());
 
     TwoSets::new(first.cloned().collect(), second.cloned().collect())
   }
 
-  pub fn a_classes(&self) -> &BTreeSet<Rc<str>> {
+  pub fn a_classes(&self) -> &BTreeSet<Arc<str>> {
     &self.a_classes
   }
 
-  pub fn b_classes(&self) -> &BTreeSet<Rc<str>> {
+  pub fn b_classes(&self) -> &BTreeSet<Arc<str>> {
     &self.b_classes
   }
 }
 
 impl Hash for AlphaPlusPlusNfcTriple {
   fn hash<H: Hasher>(&self, state: &mut H) {
-    let mut hash_classes = |set: &BTreeSet<Rc<str>>| {
+    let mut hash_classes = |set: &BTreeSet<Arc<str>>| {
       for class in set {
         state.write(class.as_bytes());
       }
@@ -136,7 +136,7 @@ impl Display for AlphaPlusPlusNfcTriple {
     let mut repr = String::new();
     repr.push('(');
 
-    let mut push_set = |set: &BTreeSet<Rc<str>>| {
+    let mut push_set = |set: &BTreeSet<Arc<str>>| {
       repr.push('{');
 
       for class in set.iter() {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/extended_alpha_set.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/extended_alpha_set.rs
index 3bf5fac3e..35249b94c 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/extended_alpha_set.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/extended_alpha_set.rs
@@ -10,13 +10,13 @@ use std::{
   collections::{BTreeSet, HashSet},
   fmt::Display,
   hash::{Hash, Hasher},
-  rc::Rc,
 };
+use std::sync::Arc;
 
 pub(crate) struct ExtendedAlphaSet {
   alpha_set: AlphaSet,
-  left_extension: BTreeSet<Rc<str>>,
-  right_extension: BTreeSet<Rc<str>>,
+  left_extension: BTreeSet<Arc<str>>,
+  right_extension: BTreeSet<Arc<str>>,
 }
 
 impl ExtendedAlphaSet {
@@ -28,7 +28,7 @@ impl ExtendedAlphaSet {
     }
   }
 
-  pub fn new(alpha_set: AlphaSet, left_extension: Rc<str>, right_extension: Rc<str>) -> Self {
+  pub fn new(alpha_set: AlphaSet, left_extension: Arc<str>, right_extension: Arc<str>) -> Self {
     Self {
       alpha_set,
       left_extension: BTreeSet::from_iter(vec![left_extension]),
@@ -36,7 +36,7 @@ impl ExtendedAlphaSet {
     }
   }
 
-  pub fn new_only_left(alpha_set: AlphaSet, left_extension: Rc<str>) -> Self {
+  pub fn new_only_left(alpha_set: AlphaSet, left_extension: Arc<str>) -> Self {
     Self {
       alpha_set,
       left_extension: BTreeSet::from_iter(vec![left_extension]),
@@ -44,7 +44,7 @@ impl ExtendedAlphaSet {
     }
   }
 
-  pub fn new_only_right(alpha_set: AlphaSet, right_extension: Rc<str>) -> Self {
+  pub fn new_only_right(alpha_set: AlphaSet, right_extension: Arc<str>) -> Self {
     Self {
       alpha_set,
       left_extension: BTreeSet::new(),
@@ -54,11 +54,11 @@ impl ExtendedAlphaSet {
 
   pub fn try_new<TLog: EventLog>(
     alpha_set: AlphaSet,
-    left_extension: Rc<str>,
-    right_extension: Rc<str>,
+    left_extension: Arc<str>,
+    right_extension: Arc<str>,
     provider: &mut AlphaPlusNfcRelationsProvider<TLog>,
-    w1_relations: &HashSet<(&Rc<str>, &Rc<str>)>,
-    w2_relations: &HashSet<(&Rc<str>, &Rc<str>)>,
+    w1_relations: &HashSet<(&Arc<str>, &Arc<str>)>,
+    w2_relations: &HashSet<(&Arc<str>, &Arc<str>)>,
   ) -> Option<Self> {
     Self::try_new_internal(provider, w1_relations, w2_relations, move || {
       Self::new(alpha_set, left_extension, right_extension)
@@ -67,8 +67,8 @@ impl ExtendedAlphaSet {
 
   fn try_new_internal<TLog: EventLog>(
     provider: &mut AlphaPlusNfcRelationsProvider<TLog>,
-    w1_relations: &HashSet<(&Rc<str>, &Rc<str>)>,
-    w2_relations: &HashSet<(&Rc<str>, &Rc<str>)>,
+    w1_relations: &HashSet<(&Arc<str>, &Arc<str>)>,
+    w2_relations: &HashSet<(&Arc<str>, &Arc<str>)>,
     factory: impl FnOnce() -> Self,
   ) -> Option<Self> {
     let new_set = factory();
@@ -80,10 +80,10 @@ impl ExtendedAlphaSet {
 
   pub fn try_new_only_left<TLog: EventLog>(
     alpha_set: AlphaSet,
-    left_extension: Rc<str>,
+    left_extension: Arc<str>,
     provider: &mut AlphaPlusNfcRelationsProvider<TLog>,
-    w1_relations: &HashSet<(&Rc<str>, &Rc<str>)>,
-    w2_relations: &HashSet<(&Rc<str>, &Rc<str>)>,
+    w1_relations: &HashSet<(&Arc<str>, &Arc<str>)>,
+    w2_relations: &HashSet<(&Arc<str>, &Arc<str>)>,
   ) -> Option<Self> {
     Self::try_new_internal(provider, w1_relations, w2_relations, || {
       Self::new_only_left(alpha_set, left_extension)
@@ -92,10 +92,10 @@ impl ExtendedAlphaSet {
 
   pub fn try_new_only_right<TLog: EventLog>(
     alpha_set: AlphaSet,
-    right_extension: Rc<str>,
+    right_extension: Arc<str>,
     provider: &mut AlphaPlusNfcRelationsProvider<TLog>,
-    w1_relations: &HashSet<(&Rc<str>, &Rc<str>)>,
-    w2_relations: &HashSet<(&Rc<str>, &Rc<str>)>,
+    w1_relations: &HashSet<(&Arc<str>, &Arc<str>)>,
+    w2_relations: &HashSet<(&Arc<str>, &Arc<str>)>,
   ) -> Option<Self> {
     Self::try_new_internal(provider, w1_relations, w2_relations, || {
       Self::new_only_right(alpha_set, right_extension)
@@ -105,8 +105,8 @@ impl ExtendedAlphaSet {
   pub fn valid<TLog: EventLog>(
     &self,
     provider: &mut AlphaPlusNfcRelationsProvider<TLog>,
-    w1_relations: &HashSet<(&Rc<str>, &Rc<str>)>,
-    w2_relations: &HashSet<(&Rc<str>, &Rc<str>)>,
+    w1_relations: &HashSet<(&Arc<str>, &Arc<str>)>,
+    w2_relations: &HashSet<(&Arc<str>, &Arc<str>)>,
   ) -> bool {
     for a in &self.left_extension {
       if self.alpha_set.contains_left(a) {
@@ -163,7 +163,7 @@ impl ExtendedAlphaSet {
     }
   }
 
-  pub fn two_sets(&self) -> TwoSets<Rc<str>> {
+  pub fn two_sets(&self) -> TwoSets<Arc<str>> {
     let first = self.alpha_set.left_classes();
     let first = first.into_iter().chain(&self.left_extension);
 
@@ -206,7 +206,7 @@ impl Display for ExtendedAlphaSet {
     repr.push_str(self.alpha_set.to_string().as_str());
     repr.push_str(", ");
 
-    let mut serialize_set = |set: &BTreeSet<Rc<str>>| {
+    let mut serialize_set = |set: &BTreeSet<Arc<str>>| {
       repr.push('{');
       for item in set {
         repr.push_str(item);
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/w3_pair.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/w3_pair.rs
index 5074d9211..f36511d3f 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/w3_pair.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/w3_pair.rs
@@ -7,23 +7,23 @@ use std::{
   collections::HashSet,
   fmt::Display,
   hash::{Hash, Hasher},
-  rc::Rc,
 };
+use std::sync::Arc;
 
 pub(crate) struct W3Pair {
-  two_sets: TwoSets<Rc<str>>,
+  two_sets: TwoSets<Arc<str>>,
 }
 
 impl W3Pair {
-  pub fn new(first: Rc<str>, second: Rc<str>) -> Self {
+  pub fn new(first: Arc<str>, second: Arc<str>) -> Self {
     Self {
       two_sets: TwoSets::new_one_element(first, second),
     }
   }
 
   pub fn try_new<TLog: EventLog>(
-    first: Rc<str>,
-    second: Rc<str>,
+    first: Arc<str>,
+    second: Arc<str>,
     w3_relations: &HashSet<(&str, &str)>,
     provider: &AlphaPlusNfcRelationsProvider<TLog>,
   ) -> Option<Self> {
@@ -68,7 +68,7 @@ impl W3Pair {
     }
   }
 
-  pub fn two_sets(&self) -> TwoSets<Rc<str>> {
+  pub fn two_sets(&self) -> TwoSets<Arc<str>> {
     self.two_sets.clone()
   }
 }
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_set.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_set.rs
index 62850d9d6..fffecab20 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_set.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_set.rs
@@ -5,16 +5,16 @@ use crate::{
 use std::{
   fmt::Display,
   hash::{Hash, Hasher},
-  rc::Rc,
 };
+use std::sync::Arc;
 
 #[derive(Debug, Default)]
 pub struct AlphaSet {
-  two_sets: TwoSets<Rc<str>>,
+  two_sets: TwoSets<Arc<str>>,
 }
 
 impl AlphaSet {
-  pub fn new(left_class: Rc<str>, right_class: Rc<str>) -> Self {
+  pub fn new(left_class: Arc<str>, right_class: Arc<str>) -> Self {
     Self {
       two_sets: TwoSets::new_one_element(left_class, right_class),
     }
@@ -40,19 +40,19 @@ impl AlphaSet {
     self.two_sets.second_set().contains(class)
   }
 
-  pub fn left_classes(&self) -> Vec<&Rc<str>> {
+  pub fn left_classes(&self) -> Vec<&Arc<str>> {
     self.two_sets.first_set().iter().collect()
   }
 
-  pub fn right_classes(&self) -> Vec<&Rc<str>> {
+  pub fn right_classes(&self) -> Vec<&Arc<str>> {
     self.two_sets.second_set().iter().collect()
   }
 
-  pub fn insert_left_class(&mut self, class: Rc<str>) {
+  pub fn insert_left_class(&mut self, class: Arc<str>) {
     self.two_sets.first_set_mut().insert(class);
   }
 
-  pub fn insert_right_class(&mut self, class: Rc<str>) {
+  pub fn insert_right_class(&mut self, class: Arc<str>) {
     self.two_sets.second_set_mut().insert(class);
   }
 
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_nfc_provider.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_nfc_provider.rs
index 06b589e08..6db681547 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_nfc_provider.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_nfc_provider.rs
@@ -13,7 +13,8 @@ use crate::{
     },
   },
 };
-use std::{collections::HashSet, rc::Rc};
+use std::collections::HashSet;
+use std::sync::Arc;
 
 enum PrePostSet {
   PreSet,
@@ -84,7 +85,7 @@ where
     self.triangle_relation(first, second) && self.triangle_relation(second, first)
   }
 
-  fn one_length_loop_transitions(&self) -> &HashSet<Rc<str>> {
+  fn one_length_loop_transitions(&self) -> &HashSet<Arc<str>> {
     self.alpha_plus_provider.one_length_loop_transitions()
   }
 }
@@ -97,7 +98,7 @@ where
     info: &'a dyn EventLogInfo,
     log: &'a TLog,
     triangle_relation: &'a dyn TriangleRelation,
-    one_length_loop_transitions: &'a HashSet<Rc<str>>,
+    one_length_loop_transitions: &'a HashSet<Arc<str>>,
   ) -> Self {
     Self {
       additional_causal_relations: HashSet::new(),
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_provider.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_provider.rs
index 4760adf2e..92f4a60a5 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_provider.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_provider.rs
@@ -2,26 +2,27 @@ use crate::features::{
   analysis::log_info::event_log_info::EventLogInfo,
   discovery::{alpha::providers::alpha_provider::AlphaRelationsProvider, relations::triangle_relation::TriangleRelation},
 };
-use std::{collections::HashSet, rc::Rc};
+use std::collections::HashSet;
+use std::sync::Arc;
 
 pub trait AlphaPlusRelationsProvider: AlphaRelationsProvider {
   fn triangle_relation(&self, first: &str, second: &str) -> bool;
   fn romb_relation(&self, first: &str, second: &str) -> bool;
 
-  fn one_length_loop_transitions(&self) -> &HashSet<Rc<str>>;
+  fn one_length_loop_transitions(&self) -> &HashSet<Arc<str>>;
 }
 
 pub struct AlphaPlusRelationsProviderImpl<'a> {
   pub log_info: &'a dyn EventLogInfo,
   triangle_relation: &'a dyn TriangleRelation,
-  one_length_loop_transitions: &'a HashSet<Rc<str>>,
+  one_length_loop_transitions: &'a HashSet<Arc<str>>,
 }
 
 impl<'a> AlphaPlusRelationsProviderImpl<'a> {
   pub fn new(
     log_info: &'a dyn EventLogInfo,
     triangle_relation: &'a dyn TriangleRelation,
-    one_length_loop_transitions: &'a HashSet<Rc<str>>,
+    one_length_loop_transitions: &'a HashSet<Arc<str>>,
   ) -> Self {
     Self {
       log_info,
@@ -62,7 +63,7 @@ impl<'a> AlphaPlusRelationsProvider for AlphaPlusRelationsProviderImpl<'a> {
     self.triangle_relation(first, second) && self.triangle_relation(second, first)
   }
 
-  fn one_length_loop_transitions(&self) -> &HashSet<Rc<str>> {
+  fn one_length_loop_transitions(&self) -> &HashSet<Arc<str>> {
     self.one_length_loop_transitions
   }
 }
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_sharp_provider.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_sharp_provider.rs
index 5ae588925..5b66dee14 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_sharp_provider.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_sharp_provider.rs
@@ -8,7 +8,8 @@ use crate::features::{
     relations::triangle_relation::TriangleRelation,
   },
 };
-use std::{collections::HashSet, rc::Rc};
+use std::collections::HashSet;
+use std::sync::Arc;
 
 pub struct AlphaSharpRelationsProvider<'a> {
   alpha_plus_provider: AlphaPlusRelationsProviderImpl<'a>,
@@ -97,7 +98,7 @@ impl<'a> AlphaSharpRelationsProvider<'a> {
   pub fn new(
     triangle_relation: &'a dyn TriangleRelation,
     info: &'a OfflineEventLogInfo,
-    one_length_loop_transitions: &'a HashSet<Rc<str>>,
+    one_length_loop_transitions: &'a HashSet<Arc<str>>,
   ) -> Self {
     Self {
       alpha_plus_provider: AlphaPlusRelationsProviderImpl::new(info, triangle_relation, one_length_loop_transitions),
diff --git a/Ficus/src/rust/ficus/src/features/discovery/ecfg/adjustments.rs b/Ficus/src/rust/ficus/src/features/discovery/ecfg/adjustments.rs
index 584157dad..b7af338a9 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/ecfg/adjustments.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/ecfg/adjustments.rs
@@ -20,8 +20,8 @@ use crate::{
 use std::{
   collections::{HashMap, HashSet},
   fmt::Debug,
-  rc::Rc,
 };
+use std::sync::Arc;
 
 pub fn merge_sequences_of_nodes(graph: &mut DefaultGraph, performance_map: Option<PerformanceMap>) {
   for current_sequence in discover_sequences_to_merge(graph) {
@@ -143,7 +143,7 @@ fn connect_added_merged_node_to_graph(nodes_ids: &NeededNodesIds, added_node: &u
 
 fn create_merged_node(nodes: &Vec<u64>, graph: &mut DefaultGraph) -> u64 {
   let label = nodes.iter().map(|id| id.to_string()).collect::<Vec<String>>().join("\n");
-  let node_id = graph.add_node(Some(Rc::from(label)));
+  let node_id = graph.add_node(Some(Arc::from(label)));
 
   let mut inner_graph = DefaultGraph::default();
   let mut prev_added_node_id = None;
diff --git a/Ficus/src/rust/ficus/src/features/discovery/ecfg/context.rs b/Ficus/src/rust/ficus/src/features/discovery/ecfg/context.rs
index 6cd9d51d6..3bfe2408e 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/ecfg/context.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/ecfg/context.rs
@@ -1,7 +1,7 @@
 use crate::{features::discovery::ecfg::models::RootSequenceKind, utils::user_data::user_data::UserDataImpl};
-use std::rc::Rc;
+use std::sync::Arc;
 
-type NameExtractor<'a, T> = &'a dyn Fn(&T) -> Rc<str>;
+type NameExtractor<'a, T> = &'a dyn Fn(&T) -> Arc<str>;
 type ArtificialStartEnd<'a, T> = &'a dyn Fn() -> (T, T);
 type NodeDataTransfer<'a, T> = &'a dyn Fn(&T, &mut UserDataImpl, bool);
 type EdgeDataTransfer<'a, T> = &'a dyn Fn(&T, &mut UserDataImpl);
diff --git a/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery.rs b/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery.rs
index 75aee0e71..99b184688 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery.rs
@@ -23,8 +23,8 @@ use lazy_static::lazy_static;
 use std::{
   collections::{HashMap, VecDeque},
   fmt::Debug,
-  rc::Rc,
 };
+use std::sync::Arc;
 
 const EVENT_UNIQUE_ID: &str = "EVENT_UNIQUE_ID";
 context_key! { EVENT_UNIQUE_ID, Vec<u64> }
@@ -189,7 +189,7 @@ fn transfer_user_data<T: PartialEq + Clone + Debug>(
   transfer_unique_event_id(node, event);
 }
 
-fn transfer_unique_event_id<T: PartialEq + Clone + Debug>(node: &mut GraphNode<Rc<str>>, event: &EventWithUniqueId<T>) {
+fn transfer_unique_event_id<T: PartialEq + Clone + Debug>(node: &mut GraphNode<Arc<str>>, event: &EventWithUniqueId<T>) {
   if let Some(node_ids) = node.user_data_mut().concrete_mut(EVENT_UNIQUE_ID_KEY.key()) {
     node_ids.push(*event.id());
   } else {
@@ -343,7 +343,7 @@ fn create_log_from_adjustments<T: PartialEq + Clone + Debug>(
 
 fn find_start_end_node_ids<T: PartialEq + Clone + Debug>(
   sub_graph: &DefaultGraph,
-  name_extractor: &dyn Fn(&T) -> Rc<str>,
+  name_extractor: &dyn Fn(&T) -> Arc<str>,
   artificial_start_end_events_factory: &dyn Fn() -> (T, T),
 ) -> (u64, u64) {
   let (mut start_node_id, mut end_node_id) = (0, 0);
diff --git a/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery_xes.rs b/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery_xes.rs
index 3be122a93..9e8f8411d 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery_xes.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery_xes.rs
@@ -33,6 +33,7 @@ use crate::{
   },
 };
 use std::{cell::RefCell, fmt::Debug, ops::Deref, rc::Rc};
+use std::sync::Arc;
 
 pub fn discover_ecfg_from_event_log(
   log: &XesEventLogImpl,
@@ -46,10 +47,10 @@ pub fn discover_ecfg_from_event_log(
 
   let artificial_start_end_events_factory = || {
     (
-      Rc::new(RefCell::new(XesEventImpl::new_with_min_date(Rc::from(
+      Rc::new(RefCell::new(XesEventImpl::new_with_min_date(Arc::from(
         ARTIFICIAL_START_EVENT_NAME.to_string(),
       )))),
-      Rc::new(RefCell::new(XesEventImpl::new_with_min_date(Rc::from(
+      Rc::new(RefCell::new(XesEventImpl::new_with_min_date(Arc::from(
         ARTIFICIAL_END_EVENT_NAME.to_string(),
       )))),
     )
diff --git a/Ficus/src/rust/ficus/src/features/discovery/ecfg/log_prepare.rs b/Ficus/src/rust/ficus/src/features/discovery/ecfg/log_prepare.rs
index 28baa8258..d579f54c6 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/ecfg/log_prepare.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/ecfg/log_prepare.rs
@@ -9,11 +9,12 @@ use crate::{
   pipelines::errors::pipeline_errors::PipelinePartExecutionError,
 };
 use std::{cell::RefCell, collections::HashMap, rc::Rc};
+use std::sync::Arc;
 
 pub fn prepare_software_log(
   log: &XesEventLogImpl,
   config: &SoftwareDataExtractionConfig,
-  time_attribute: Option<&Rc<str>>,
+  time_attribute: Option<&Arc<str>>,
 ) -> Result<XesEventLogImpl, PipelinePartExecutionError> {
   let control_flow_regexes = config.control_flow_regexes().map_err(PipelinePartExecutionError::new_raw)?;
   if control_flow_regexes.is_none() {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/fuzzy/fuzzy_miner.rs b/Ficus/src/rust/ficus/src/features/discovery/fuzzy/fuzzy_miner.rs
index 323f8c1bd..9d210ea90 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/fuzzy/fuzzy_miner.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/fuzzy/fuzzy_miner.rs
@@ -12,8 +12,9 @@ use std::{
   collections::{HashMap, HashSet},
   rc::Rc,
 };
+use std::sync::Arc;
 
-pub type FuzzyGraph = Graph<Rc<str>, f64>;
+pub type FuzzyGraph = Graph<Arc<str>, f64>;
 
 pub fn discover_graph_fuzzy(
   log: &impl EventLog,
@@ -49,7 +50,7 @@ pub fn discover_graph_fuzzy(
 fn initialize_fuzzy_graph<TLog: EventLog>(
   graph: &mut FuzzyGraph,
   provider: &FuzzyMetricsProvider<TLog>,
-  classes_to_ids: &mut HashMap<Rc<str>, u64>,
+  classes_to_ids: &mut HashMap<Arc<str>, u64>,
   unary_frequency_threshold: f64,
   binary_frequency_significance_threshold: f64,
 ) {
@@ -75,7 +76,7 @@ fn initialize_fuzzy_graph<TLog: EventLog>(
 }
 
 fn resolve_conflicts<TLog: EventLog>(
-  classes_to_ids: &HashMap<Rc<str>, u64>,
+  classes_to_ids: &HashMap<Arc<str>, u64>,
   provider: &FuzzyMetricsProvider<TLog>,
   graph: &mut FuzzyGraph,
   preserve_threshold: f64,
@@ -257,7 +258,7 @@ fn merge_nodes(graph: &mut FuzzyGraph, clusters: &ClustersMap) {
 
         cluster_data.push(']');
 
-        Some(Rc::from(cluster_data))
+        Some(Arc::from(cluster_data))
       },
       |edges_data| {
         edges_data.iter().fold(NodesConnectionData::default(), |first, second| {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/heuristic/heuristic_miner.rs b/Ficus/src/rust/ficus/src/features/discovery/heuristic/heuristic_miner.rs
index befaf29fc..f55013400 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/heuristic/heuristic_miner.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/heuristic/heuristic_miner.rs
@@ -14,6 +14,7 @@ use std::{
   collections::{HashMap, HashSet},
   rc::Rc,
 };
+use std::sync::Arc;
 
 pub fn discover_petri_net_heuristic(
   info: &dyn EventLogInfo,
@@ -92,7 +93,7 @@ fn construct_heuristic_petri_net(provider: &HeuristicMinerRelationsProvider, pet
     petri_net.connect_transition_to_place(classes_to_ids.get(first_class).unwrap(), &post_place_id, None);
 
     for group in &parallel_groups {
-      let name = Rc::<str>::from(format!("silent_start_{first_class}"));
+      let name = Arc::<str>::from(format!("silent_start_{first_class}"));
       let id = petri_net.add_transition(Transition::empty(name.to_owned(), true, Some(name.to_owned())));
       petri_net.connect_place_to_transition(&post_place_id, &id, None);
 
diff --git a/Ficus/src/rust/ficus/src/features/discovery/heuristic/relations_provider.rs b/Ficus/src/rust/ficus/src/features/discovery/heuristic/relations_provider.rs
index 357bfd3fb..8773330c8 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/heuristic/relations_provider.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/heuristic/relations_provider.rs
@@ -5,9 +5,10 @@ use crate::features::{
     relations::triangle_relation::TriangleRelation,
   },
 };
-use std::{collections::HashMap, rc::Rc};
+use std::collections::HashMap;
+use std::sync::Arc;
 
-type DependencyRelations = HashMap<Rc<str>, HashMap<Rc<str>, f64>>;
+type DependencyRelations = HashMap<Arc<str>, HashMap<Arc<str>, f64>>;
 
 pub(crate) struct HeuristicMinerRelationsProvider<'a> {
   dependency_threshold: f64,
@@ -52,7 +53,7 @@ impl<'a> HeuristicMinerRelationsProvider<'a> {
   }
 
   fn initialize_dependency_relations(&mut self) {
-    let mut relations = HashMap::<Rc<str>, Vec<(Rc<str>, f64)>>::new();
+    let mut relations = HashMap::<Arc<str>, Vec<(Arc<str>, f64)>>::new();
     for first_class in self.provider.log_info().all_event_classes() {
       for second_class in self.provider.log_info().all_event_classes() {
         let second_follows_first = self.get_directly_follows_count(first_class, second_class);
diff --git a/Ficus/src/rust/ficus/src/features/discovery/multithreaded_dfg/dfg.rs b/Ficus/src/rust/ficus/src/features/discovery/multithreaded_dfg/dfg.rs
index fddec7134..69a1d179d 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/multithreaded_dfg/dfg.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/multithreaded_dfg/dfg.rs
@@ -19,6 +19,7 @@ use std::{
   collections::{HashMap, HashSet},
   rc::Rc,
 };
+use std::sync::Arc;
 
 const MULTITHREADED_FRAGMENT: &str = "MULTITHREADED_FRAGMENT";
 
@@ -49,7 +50,7 @@ pub fn discover_multithreaded_dfg(
     let first_node_id = add_node(first, &mut graph, &mut added_nodes);
     let second_node_id = add_node(second, &mut graph, &mut added_nodes);
 
-    let data = Some(Rc::from(count.to_string()));
+    let data = Some(Arc::from(count.to_string()));
     graph.connect_nodes(&first_node_id, &second_node_id, NodesConnectionData::new(data, count as f64, None));
   }
 
@@ -140,7 +141,7 @@ fn add_node(name: String, graph: &mut DefaultGraph, added_nodes: &mut HashMap<St
   if let Some(node_id) = added_nodes.get(name.as_str()) {
     *node_id
   } else {
-    let node_id = graph.add_node(Some(Rc::from(name.clone())));
+    let node_id = graph.add_node(Some(Arc::from(name.clone())));
     added_nodes.insert(name, node_id);
     node_id
   }
diff --git a/Ficus/src/rust/ficus/src/features/discovery/ocel/graph_annotation.rs b/Ficus/src/rust/ficus/src/features/discovery/ocel/graph_annotation.rs
index 63d88bf71..89a75ce24 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/ocel/graph_annotation.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/ocel/graph_annotation.rs
@@ -8,8 +8,8 @@ use getset::Getters;
 use lazy_static::lazy_static;
 use std::{
   collections::{HashMap, HashSet, VecDeque},
-  rc::Rc,
 };
+use std::sync::Arc;
 
 #[derive(new, Getters)]
 pub struct OcelAnnotation {
@@ -29,11 +29,11 @@ pub enum OcelAnnotationCreationError {
 #[derive(Getters, Default)]
 pub struct NodeObjectsState {
   #[getset(get = "pub")]
-  map: HashMap<Rc<str>, HashSet<Rc<str>>>,
+  map: HashMap<Arc<str>, HashSet<Arc<str>>>,
 }
 
 impl NodeObjectsState {
-  pub fn add_allocated_object(&mut self, object_type: Rc<str>, object_id: Rc<str>) -> Result<(), OcelAnnotationCreationError> {
+  pub fn add_allocated_object(&mut self, object_type: Arc<str>, object_id: Arc<str>) -> Result<(), OcelAnnotationCreationError> {
     if self.contains_object(&object_type, &object_id) {
       return Err(OcelAnnotationCreationError::ObjectAlreadyExistsInNodeState);
     }
@@ -42,13 +42,13 @@ impl NodeObjectsState {
     Ok(())
   }
 
-  pub fn remove_object(&mut self, object_type: &Rc<str>, id: &Rc<str>) {
+  pub fn remove_object(&mut self, object_type: &Arc<str>, id: &Arc<str>) {
     let Some(set) = self.map.get_mut(object_type) else { return };
 
     set.remove(id);
   }
 
-  pub fn remove_unknown_object(&mut self, id: &Rc<str>) {
+  pub fn remove_unknown_object(&mut self, id: &Arc<str>) {
     for (_, set) in self.map.iter_mut() {
       if set.remove(id) {
         return;
@@ -68,7 +68,7 @@ impl NodeObjectsState {
     self.map.values().any(|set| set.contains(object_id))
   }
 
-  fn type_set_mut(&mut self, object_type: &Rc<str>) -> &mut HashSet<Rc<str>> {
+  fn type_set_mut(&mut self, object_type: &Arc<str>) -> &mut HashSet<Arc<str>> {
     if !self.map.contains_key(object_type) {
       self.map.insert(object_type.clone(), HashSet::new());
     }
@@ -100,11 +100,11 @@ pub struct ProcessNodesStates {
 #[derive(new, Getters)]
 pub struct OcelObjectRelations {
   #[get = "pub"]
-  object_id: Rc<str>,
+  object_id: Arc<str>,
   #[get = "pub"]
   from_element_id: u64,
   #[get = "pub"]
-  related_objects_ids: Vec<Rc<str>>,
+  related_objects_ids: Vec<Arc<str>>,
 }
 
 lazy_static! {
@@ -152,7 +152,7 @@ pub fn create_ocel_annotation_for_dag(graph: &DefaultGraph) -> Result<OcelAnnota
     let mut new_node_state: NodeObjectsState = Default::default();
     let mut new_node_objects_relations = vec![];
 
-    let fallback_type = Rc::from(UNKNOWN_TYPE.clone());
+    let fallback_type = Arc::from(UNKNOWN_TYPE.clone());
 
     for incoming_node in incoming_nodes.iter() {
       let prev_state: &ProcessNodesStates = process_nodes_states.get(*incoming_node).as_ref().unwrap();
diff --git a/Ficus/src/rust/ficus/src/features/discovery/petri_net/annotations.rs b/Ficus/src/rust/ficus/src/features/discovery/petri_net/annotations.rs
index 4e627e81a..48d1d51a8 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/petri_net/annotations.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/petri_net/annotations.rs
@@ -10,6 +10,7 @@ use crate::{
 use lazy_static::lazy_static;
 use log::error;
 use std::{collections::HashMap, rc::Rc, str::FromStr};
+use std::sync::Arc;
 
 pub fn annotate_with_counts(
   log: &impl EventLog,
@@ -102,7 +103,7 @@ pub enum PerformanceAnnotationInfo {
 const PERFORMANCE_ANNOTATION_INFO: &str = "PERFORMANCE_ANNOTATION_INFO";
 context_key! { PERFORMANCE_ANNOTATION_INFO, PerformanceAnnotationInfo }
 
-pub type PerformanceMap = HashMap<(Rc<str>, Rc<str>), (f64, usize)>;
+pub type PerformanceMap = HashMap<(Arc<str>, Arc<str>), (f64, usize)>;
 
 pub fn create_performance_map(log: &impl EventLog) -> PerformanceMap {
   let mut performance_map = HashMap::new();
@@ -173,8 +174,8 @@ pub fn annotate_with_time_performance(log: &impl EventLog, graph: &DefaultGraph,
 
 fn try_get_time_annotation(
   performance_map: &PerformanceMap,
-  first_node: &GraphNode<Rc<str>>,
-  second_node: &GraphNode<Rc<str>>,
+  first_node: &GraphNode<Arc<str>>,
+  second_node: &GraphNode<Arc<str>>,
 ) -> Option<(f64, usize)> {
   if first_node.data.is_some() && second_node.data.is_some() {
     let key = (
diff --git a/Ficus/src/rust/ficus/src/features/discovery/petri_net/petri_net.rs b/Ficus/src/rust/ficus/src/features/discovery/petri_net/petri_net.rs
index 2eab8c99f..0070c3c29 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/petri_net/petri_net.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/petri_net/petri_net.rs
@@ -1,8 +1,9 @@
 use super::arc::PetriNetArc;
 use crate::features::discovery::petri_net::{marking::Marking, place::Place, transition::Transition};
-use std::{collections::HashMap, rc::Rc};
+use std::collections::HashMap;
+use std::sync::Arc;
 
-pub type DefaultPetriNet = PetriNet<Rc<str>, ()>;
+pub type DefaultPetriNet = PetriNet<Arc<str>, ()>;
 
 #[derive(Debug, Default)]
 struct PlaceTransitions {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/petri_net/replay.rs b/Ficus/src/rust/ficus/src/features/discovery/petri_net/replay.rs
index 25d271528..49d6984c7 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/petri_net/replay.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/petri_net/replay.rs
@@ -1,9 +1,8 @@
 use crate::event_log::core::{event::event::Event, event_log::EventLog, trace::trace::Trace};
 use std::{
   collections::{HashMap, VecDeque},
-  rc::Rc,
 };
-
+use std::sync::Arc;
 use super::{marking::Marking, petri_net::DefaultPetriNet, transition::Transition};
 
 #[derive(Debug)]
@@ -83,7 +82,7 @@ impl ReplayState {
     Some(new_states)
   }
 
-  fn find_transitions_to_fire<'a>(net: &'a DefaultPetriNet, symbol: &'a str) -> Vec<&'a Transition<Rc<str>, ()>> {
+  fn find_transitions_to_fire<'a>(net: &'a DefaultPetriNet, symbol: &'a str) -> Vec<&'a Transition<Arc<str>, ()>> {
     let mut result = vec![];
     for transition in net.all_transitions() {
       if transition.name() == symbol {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/petri_net/transition.rs b/Ficus/src/rust/ficus/src/features/discovery/petri_net/transition.rs
index 447ff9244..f4f499ced 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/petri_net/transition.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/petri_net/transition.rs
@@ -1,8 +1,8 @@
 use crate::features::discovery::petri_net::{arc::PetriNetArc, ids::next_id};
 use std::{
   hash::{Hash, Hasher},
-  rc::Rc,
 };
+use std::sync::Arc;
 
 #[derive(Debug)]
 pub struct Transition<TTransitionData, TArcData>
@@ -10,7 +10,7 @@ where
   TTransitionData: ToString,
 {
   id: u64,
-  name: Rc<str>,
+  name: Arc<str>,
   silent_transition: bool,
   incoming_arcs: Vec<PetriNetArc<TArcData>>,
   outgoing_arcs: Vec<PetriNetArc<TArcData>>,
@@ -41,7 +41,7 @@ impl<TTransitionData, TArcData> Transition<TTransitionData, TArcData>
 where
   TTransitionData: ToString,
 {
-  pub fn empty(name: Rc<str>, silent_transition: bool, data: Option<TTransitionData>) -> Self {
+  pub fn empty(name: Arc<str>, silent_transition: bool, data: Option<TTransitionData>) -> Self {
     Self {
       id: next_id(),
       name,
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/abstraction.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/abstraction.rs
index ab6b24f51..bdcebf92e 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/abstraction.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/abstraction.rs
@@ -38,12 +38,13 @@ use crate::{
 };
 use log::error;
 use std::{cell::RefCell, rc::Rc};
+use std::sync::Arc;
 
 pub fn abstract_event_groups(
   event_groups: Vec<Vec<EventGroup>>,
   labels: &[usize],
-  thread_attribute: Option<&Rc<str>>,
-  time_attribute: Option<&Rc<str>>,
+  thread_attribute: Option<&Arc<str>>,
+  time_attribute: Option<&Arc<str>>,
   config: &SoftwareDataExtractionConfig,
 ) -> Result<XesEventLogImpl, PipelinePartExecutionError> {
   let mut current_label_index = 0;
@@ -94,8 +95,8 @@ pub fn abstract_event_groups(
 fn create_abstracted_event(
   event_group: &EventGroup,
   label: &usize,
-  thread_attribute: Option<&Rc<str>>,
-  time_attribute: Option<&Rc<str>>,
+  thread_attribute: Option<&Arc<str>>,
+  time_attribute: Option<&Arc<str>>,
   event_coordinates: EventCoordinates,
   config: &SoftwareDataExtractionConfig,
   mut node_software_data: SoftwareData,
@@ -105,7 +106,7 @@ fn create_abstracted_event(
   let abstracted_event_stamp = *event_group.control_flow_events().last().unwrap().borrow().timestamp() - first_stamp;
   let abstracted_event_stamp = first_stamp + abstracted_event_stamp;
 
-  let label_name = Rc::from(label.to_string());
+  let label_name = Arc::from(label.to_string());
 
   let mut event = XesEventImpl::new_all_fields(label_name, abstracted_event_stamp, None);
 
@@ -217,10 +218,10 @@ fn extract_software_data(
   node_software_data: &mut SoftwareData,
   edge_software_data: &mut SoftwareData,
 ) -> Result<(), PipelinePartExecutionError> {
-  let edge_extractors: Vec<Rc<Box<dyn EventGroupSoftwareDataExtractor>>> = create_edge_software_data_extractors(config);
+  let edge_extractors: Vec<Arc<Box<dyn EventGroupSoftwareDataExtractor>>> = create_edge_software_data_extractors(config);
 
   let mut node_extractors = edge_extractors.clone();
-  node_extractors.push(Rc::new(Box::new(EventClassesDataExtractor::new(thread_attribute, time_attribute))));
+  node_extractors.push(Arc::new(Box::new(EventClassesDataExtractor::new(thread_attribute, time_attribute))));
 
   for extractor in node_extractors {
     extractor
@@ -254,14 +255,14 @@ pub fn extract_edge_software_data(
 
 fn create_edge_software_data_extractors<'a>(
   config: &'a SoftwareDataExtractionConfig,
-) -> Vec<Rc<Box<dyn EventGroupSoftwareDataExtractor + 'a>>> {
+) -> Vec<Arc<Box<dyn EventGroupSoftwareDataExtractor + 'a>>> {
   vec![
-    Rc::new(Box::new(PieChartExtractor::<'a>::new(config))),
-    Rc::new(Box::new(SimpleCounterExtractor::<'a>::new(config))),
-    Rc::new(Box::new(OcelDataExtractor::<'a>::new(config))),
+    Arc::new(Box::new(PieChartExtractor::<'a>::new(config))),
+    Arc::new(Box::new(SimpleCounterExtractor::<'a>::new(config))),
+    Arc::new(Box::new(OcelDataExtractor::<'a>::new(config))),
   ]
 }
 
-fn create_trace_extractors<'a>(config: &'a SoftwareDataExtractionConfig) -> Vec<Rc<Box<dyn EventGroupTraceSoftwareDataExtractor + 'a>>> {
-  vec![Rc::new(Box::new(ActivityDurationExtractor::<'a>::new(config)))]
+fn create_trace_extractors<'a>(config: &'a SoftwareDataExtractionConfig) -> Vec<Arc<Box<dyn EventGroupTraceSoftwareDataExtractor + 'a>>> {
+  vec![Arc::new(Box::new(ActivityDurationExtractor::<'a>::new(config)))]
 }
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/discovery.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/discovery.rs
index bed5cf907..7832e182e 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/discovery.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/discovery.rs
@@ -20,13 +20,14 @@ use std::{
   ops::Deref,
   rc::Rc,
 };
+use std::sync::Arc;
 
 #[derive(Debug, Clone, Getters, new)]
 pub struct LogTimelineDiagram {
   #[getset(get = "pub")]
-  thread_attribute: Rc<str>,
+  thread_attribute: Arc<str>,
   #[getset(get = "pub")]
-  time_attribute: Option<Rc<str>>,
+  time_attribute: Option<Arc<str>>,
   #[getset(get = "pub")]
   control_flow_regexes: Option<Vec<Regex>>,
   #[getset(get = "pub")]
@@ -101,7 +102,7 @@ impl From<LogThreadsDiagramError> for PipelinePartExecutionError {
 
 pub fn discover_traces_timeline_diagram(
   log: &XesEventLogImpl,
-  time_attribute: Option<&Rc<str>>,
+  time_attribute: Option<&Arc<str>>,
   event_group_delta: Option<u64>,
   discover_event_groups_in_each_trace: bool,
   control_flow_regexes: Option<&Vec<Regex>>,
@@ -144,7 +145,7 @@ pub fn discover_traces_timeline_diagram(
 
   Ok(LogTimelineDiagram {
     control_flow_regexes: control_flow_regexes.cloned(),
-    thread_attribute: Rc::from("Trace".to_string()),
+    thread_attribute: Arc::from("Trace".to_string()),
     traces: timeline_fragments,
     time_attribute: time_attribute.cloned(),
   })
@@ -164,8 +165,8 @@ fn discover_events_groups_internal(
 
 pub fn discover_timeline_diagram(
   log: &XesEventLogImpl,
-  thread_attribute: &Rc<str>,
-  time_attribute: Option<&Rc<str>>,
+  thread_attribute: &Arc<str>,
+  time_attribute: Option<&Arc<str>>,
   event_group_delta: Option<u64>,
   control_flow_regexes: Option<&Vec<Regex>>,
 ) -> Result<LogTimelineDiagram, LogThreadsDiagramError> {
@@ -179,7 +180,7 @@ pub fn discover_timeline_diagram(
 
     let time_attribute = time_attribute.map(|a| a.as_ref());
     let min_stamp = get_stamp(&trace.events().first().unwrap().borrow(), time_attribute)?;
-    let mut threads: HashMap<Option<Rc<str>>, TraceThread> = HashMap::new();
+    let mut threads: HashMap<Option<Arc<str>>, TraceThread> = HashMap::new();
 
     for i in 0..trace.events().len() {
       let event = trace.events().get(i).expect("Must be in range");
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extraction_config.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extraction_config.rs
index a4a1958af..99402d9d9 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extraction_config.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extraction_config.rs
@@ -3,7 +3,8 @@ use derive_new::new;
 use fancy_regex::Regex;
 use getset::{Getters, Setters};
 use serde::{Deserialize, Serialize};
-use std::{fmt::Debug, rc::Rc};
+use std::fmt::Debug;
+use std::sync::Arc;
 
 #[derive(Clone, Debug, Setters, Getters, Serialize, Deserialize, Default)]
 pub struct SoftwareDataExtractionConfig {
@@ -77,29 +78,29 @@ pub struct OcelAllocateMergeExtractionConfig {
   #[getset(get = "pub")]
   allocated_obj: OcelObjectExtractionConfigBase,
   #[getset(get = "pub")]
-  related_object_ids_attr: Rc<str>,
+  related_object_ids_attr: Arc<str>,
 }
 
 #[derive(Clone, Debug, Getters, Serialize, Deserialize, new)]
 pub struct OcelConsumeProduceExtractionConfig {
   #[getset(get = "pub")]
-  object_id_attr: Rc<str>,
+  object_id_attr: Arc<str>,
   #[getset(get = "pub")]
-  related_object_ids_attr: Rc<str>,
+  related_object_ids_attr: Arc<str>,
   #[getset(get = "pub")]
-  related_object_type_attr: Rc<str>,
+  related_object_type_attr: Arc<str>,
 }
 
 #[derive(Clone, Debug, Getters, Serialize, Deserialize, new)]
 pub struct AllocationExtractionConfig {
   #[getset(get = "pub")]
-  type_name_attr: Rc<str>,
+  type_name_attr: Arc<str>,
   #[getset(get = "pub")]
-  allocated_count_attr: Rc<str>,
+  allocated_count_attr: Arc<str>,
   #[getset(get = "pub")]
-  object_size_bytes_attr: Option<Rc<str>>,
+  object_size_bytes_attr: Option<Arc<str>>,
   #[getset(get = "pub")]
-  total_allocated_bytes_attr: Option<Rc<str>>,
+  total_allocated_bytes_attr: Option<Arc<str>>,
 }
 
 #[derive(Clone, Debug, Getters, Serialize, Deserialize, new)]
@@ -107,23 +108,23 @@ pub struct MethodStartEndConfig {
   #[getset(get = "pub")]
   method_attrs: MethodCommonAttributesConfig,
   #[getset(get = "pub")]
-  prefix: Option<Rc<str>>,
+  prefix: Option<Arc<str>>,
 }
 
 #[derive(Clone, Debug, Getters, Serialize, Deserialize, new)]
 pub struct MethodCommonAttributesConfig {
   #[getset(get = "pub")]
-  name_attr: Rc<str>,
+  name_attr: Arc<str>,
   #[getset(get = "pub")]
-  namespace_attr: Rc<str>,
+  namespace_attr: Arc<str>,
   #[getset(get = "pub")]
-  signature_attr: Rc<str>,
+  signature_attr: Arc<str>,
 }
 
 #[derive(Clone, Debug, Getters, Serialize, Deserialize, new)]
 pub struct ExtractionConfig<TConcreteInfo: Clone + Debug> {
   #[getset(get = "pub")]
-  event_class_regex: Rc<str>,
+  event_class_regex: Arc<str>,
   #[getset(get = "pub")]
   info: TConcreteInfo,
 }
@@ -135,17 +136,17 @@ pub struct PieChartExtractionConfig {
   #[getset(get = "pub")]
   grouping_attr: Option<NameCreationStrategy>,
   #[getset(get = "pub")]
-  count_attr: Option<Rc<str>>,
+  count_attr: Option<Arc<str>>,
 }
 
 #[derive(Clone, Debug, Getters, Serialize, Deserialize, new)]
 pub struct GenericExtractionConfigBase {
   #[getset(get = "pub")]
-  name: Rc<str>,
+  name: Arc<str>,
   #[getset(get = "pub")]
-  units: Rc<str>,
+  units: Arc<str>,
   #[getset(get = "pub")]
-  group: Option<Rc<str>>,
+  group: Option<Arc<str>>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize, new)]
@@ -156,7 +157,7 @@ pub enum NameCreationStrategy {
 }
 
 impl NameCreationStrategy {
-  pub fn fallback_value(&self) -> Rc<str> {
+  pub fn fallback_value(&self) -> Arc<str> {
     match self {
       NameCreationStrategy::SingleAttribute(s) => s.fallback_value().clone(),
       NameCreationStrategy::ManyAttributes(m) => m.fallback_value().clone(),
@@ -167,19 +168,19 @@ impl NameCreationStrategy {
 #[derive(Clone, Debug, Getters, Serialize, Deserialize, new)]
 pub struct SingleAttribute {
   #[getset(get = "pub")]
-  name: Rc<str>,
+  name: Arc<str>,
   #[getset(get = "pub")]
-  fallback_value: Rc<str>,
+  fallback_value: Arc<str>,
 }
 
 #[derive(Clone, Debug, Getters, Serialize, Deserialize, new)]
 pub struct ManyAttributes {
   #[getset(get = "pub")]
-  attributes: Vec<Rc<str>>,
+  attributes: Vec<Arc<str>>,
   #[getset(get = "pub")]
-  separator: Rc<str>,
+  separator: Arc<str>,
   #[getset(get = "pub")]
-  fallback_value: Rc<str>,
+  fallback_value: Arc<str>,
 }
 
 #[derive(Clone, Debug, Getters, Serialize, Deserialize, new)]
@@ -187,7 +188,7 @@ pub struct SimpleCountExtractionConfig {
   #[getset(get = "pub")]
   base: GenericExtractionConfigBase,
   #[getset(get = "pub")]
-  count_attr: Option<Rc<str>>,
+  count_attr: Option<Arc<str>>,
 }
 
 #[derive(Clone, Debug, Getters, Serialize, Deserialize, new)]
@@ -195,9 +196,9 @@ pub struct ActivityDurationExtractionConfig {
   #[getset(get = "pub")]
   base: GenericExtractionConfigBase,
   #[getset(get = "pub")]
-  start_event_regex: Rc<str>,
+  start_event_regex: Arc<str>,
   #[getset(get = "pub")]
-  end_event_regex: Rc<str>,
+  end_event_regex: Arc<str>,
   #[getset(get = "pub")]
   time_attribute: Option<TimeAttributeConfig>,
   #[getset(get = "pub")]
@@ -207,7 +208,7 @@ pub struct ActivityDurationExtractionConfig {
 #[derive(Clone, Debug, Getters, Serialize, Deserialize, new)]
 pub struct TimeAttributeConfig {
   #[getset(get = "pub")]
-  time_attribute: Rc<str>,
+  time_attribute: Arc<str>,
   #[getset(get = "pub")]
   kind: TimeKind,
 }
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/activities_durations.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/activities_durations.rs
index 75a0a7971..8f7c9296e 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/activities_durations.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/activities_durations.rs
@@ -19,6 +19,7 @@ use fancy_regex::Regex;
 use getset::Getters;
 use log::error;
 use std::{cell::RefCell, collections::HashMap, rc::Rc};
+use std::sync::Arc;
 
 #[derive(Clone, Debug, new)]
 pub struct ActivityDurationExtractor<'a> {
@@ -235,7 +236,7 @@ impl DurationsMapExtensions for DurationsMap {
 #[derive(Getters, new)]
 struct StackActivityStartEntry {
   #[getset(get = "pub")]
-  id: Option<Rc<str>>,
+  id: Option<Arc<str>>,
   #[getset(get = "pub")]
   event: Rc<RefCell<XesEventImpl>>,
 }
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/core.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/core.rs
index ca583f1e3..8bd682e09 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/core.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/core.rs
@@ -9,11 +9,12 @@ use std::{
   rc::Rc,
   str::FromStr,
 };
+use std::sync::Arc;
 
 #[derive(Debug, Clone)]
 pub enum SoftwareDataExtractionError {
-  FailedToParseRegex(Rc<str>),
-  FailedToParseValue(Rc<str>),
+  FailedToParseRegex(Arc<str>),
+  FailedToParseValue(Arc<str>),
   FailedToGetStamp,
 }
 
@@ -54,7 +55,7 @@ pub trait EventGroupTraceSoftwareDataExtractor {
 pub(super) fn parse_or_err<ToType: FromStr>(value: &str) -> Result<ToType, SoftwareDataExtractionError> {
   match value.parse::<ToType>() {
     Ok(value) => Ok(value),
-    Err(_) => Err(SoftwareDataExtractionError::FailedToParseValue(Rc::from(format!(
+    Err(_) => Err(SoftwareDataExtractionError::FailedToParseValue(Arc::from(format!(
       "Failed to parse value: {}",
       value
     )))),
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/ocel.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/ocel.rs
index 80acc3599..f4e0386cb 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/ocel.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/ocel.rs
@@ -16,6 +16,7 @@ use derive_new::new;
 use fancy_regex::Regex;
 use log::{debug, warn};
 use std::{cell::RefCell, collections::HashMap, fmt::Debug, rc::Rc};
+use std::sync::Arc;
 
 #[derive(Debug, Clone, new)]
 pub struct OcelDataExtractor<'a> {
@@ -111,7 +112,7 @@ impl<'a> OcelDataExtractor<'a> {
     true
   }
 
-  fn extract_object_id_and_type(event: &XesEventImpl, config: &OcelObjectExtractionConfigBase) -> Option<(Rc<str>, Rc<str>)> {
+  fn extract_object_id_and_type(event: &XesEventImpl, config: &OcelObjectExtractionConfigBase) -> Option<(Arc<str>, Arc<str>)> {
     let object_type = config.object_type_attr().create(event);
 
     let object_id = match Self::parse_object_id(event, config.object_id_attr().as_str()) {
@@ -194,7 +195,7 @@ impl<'a> OcelDataExtractor<'a> {
     true
   }
 
-  fn parse_object_id(event: &XesEventImpl, object_id_attr: &str) -> Option<Rc<str>> {
+  fn parse_object_id(event: &XesEventImpl, object_id_attr: &str) -> Option<Arc<str>> {
     if let Some(map) = event.payload_map().as_ref()
       && let Some(object_id) = map.get(object_id_attr).as_ref()
     {
@@ -205,18 +206,18 @@ impl<'a> OcelDataExtractor<'a> {
   }
 
   fn parse_related_objects_ids(
-    payload: &HashMap<Rc<str>, EventPayloadValue>,
-    related_objects_ids_attr: Option<&Rc<str>>,
+    payload: &HashMap<Arc<str>, EventPayloadValue>,
+    related_objects_ids_attr: Option<&Arc<str>>,
     delimiter: &str,
-  ) -> Option<Vec<Rc<str>>> {
+  ) -> Option<Vec<Arc<str>>> {
     if let Some(related_objects_ids_attr) = related_objects_ids_attr
       && let Some(objects_ids) = payload.get(related_objects_ids_attr)
     {
-      let parsed_ids: Vec<Rc<str>> = objects_ids
+      let parsed_ids: Vec<Arc<str>> = objects_ids
         .to_string_repr()
         .trim()
         .split(delimiter)
-        .filter_map(|s| if !s.is_empty() { Some(Rc::from(s)) } else { None })
+        .filter_map(|s| if !s.is_empty() { Some(Arc::from(s)) } else { None })
         .collect();
 
       if parsed_ids.is_empty() {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/utils.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/utils.rs
index fad5d0307..6edc71e43 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/utils.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/utils.rs
@@ -6,12 +6,13 @@ use crate::{
   features::discovery::timeline::software_data::{extraction_config::NameCreationStrategy, extractors::core::SoftwareDataExtractionError},
 };
 use fancy_regex::Regex;
-use std::{collections::HashMap, rc::Rc};
+use std::collections::HashMap;
+use std::sync::Arc;
 
 pub type RegexParingResult = Result<Regex, SoftwareDataExtractionError>;
 
 impl NameCreationStrategy {
-  pub(super) fn create(&self, event: &XesEventImpl) -> Rc<str> {
+  pub(super) fn create(&self, event: &XesEventImpl) -> Arc<str> {
     if let Some(map) = event.payload_map() {
       match self {
         NameCreationStrategy::SingleAttribute(single_attribute) => self.value_or_fallback(single_attribute.name(), map),
@@ -26,7 +27,7 @@ impl NameCreationStrategy {
             result.remove(result.len() - 1);
           }
 
-          Rc::from(result)
+          Arc::from(result)
         }
       }
     } else {
@@ -34,7 +35,7 @@ impl NameCreationStrategy {
     }
   }
 
-  fn value_or_fallback(&self, attr: &str, payload: &HashMap<Rc<str>, EventPayloadValue>) -> Rc<str> {
+  fn value_or_fallback(&self, attr: &str, payload: &HashMap<Arc<str>, EventPayloadValue>) -> Arc<str> {
     if let Some(attr_value) = payload.get(attr) {
       attr_value.to_string_repr()
     } else {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/models.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/models.rs
index e2c6f92f8..8fc1d8233 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/models.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/models.rs
@@ -3,13 +3,14 @@ use derive_new::new;
 use enum_display::EnumDisplay;
 use getset::{Getters, MutGetters};
 use serde::{Deserialize, Serialize};
-use std::{collections::HashMap, rc::Rc};
+use std::collections::HashMap;
+use std::sync::Arc;
 
 #[derive(Clone, Debug, Getters, MutGetters, Serialize, Deserialize, Default)]
 pub struct SoftwareData {
   #[getset(get = "pub", get_mut = "pub")]
   #[serde(skip_serializing_if = "HashMap::is_empty")]
-  event_classes: HashMap<Rc<str>, usize>,
+  event_classes: HashMap<Arc<str>, usize>,
 
   #[getset(get = "pub", get_mut = "pub")]
   #[serde(skip)]
@@ -35,15 +36,15 @@ pub struct SoftwareData {
 #[derive(Clone, Debug, Getters, Serialize, Deserialize, new)]
 pub struct OcelProducedObjectAfterConsume {
   #[getset(get = "pub")]
-  id: Rc<str>,
+  id: Arc<str>,
   #[getset(get = "pub")]
-  r#type: Option<Rc<str>>,
+  r#type: Option<Arc<str>>,
 }
 
 #[derive(Clone, Debug, Getters, Serialize, Deserialize, new)]
 pub struct ObjectTypeWithData<T> {
   #[getset(get = "pub")]
-  r#type: Option<Rc<str>>,
+  r#type: Option<Arc<str>>,
   #[getset(get = "pub")]
   data: T,
 }
@@ -52,14 +53,14 @@ pub struct ObjectTypeWithData<T> {
 pub enum OcelObjectAction {
   Allocate(ObjectTypeWithData<()>),
   Consume(ObjectTypeWithData<()>),
-  AllocateMerged(ObjectTypeWithData<Vec<Rc<str>>>),
+  AllocateMerged(ObjectTypeWithData<Vec<Arc<str>>>),
   ConsumeWithProduce(Vec<OcelProducedObjectAfterConsume>),
 }
 
 #[derive(Clone, Debug, Getters, new, Serialize, Deserialize)]
 pub struct OcelData {
   #[getset(get = "pub")]
-  object_id: Rc<str>,
+  object_id: Arc<str>,
   #[getset(get = "pub")]
   action: OcelObjectAction,
 }
@@ -75,17 +76,17 @@ pub struct HistogramData {
 #[derive(Clone, Debug, Getters, MutGetters, new, Serialize, Deserialize)]
 pub struct GenericEnhancementBase {
   #[getset(get = "pub")]
-  name: Rc<str>,
+  name: Arc<str>,
   #[getset(get = "pub")]
-  units: Rc<str>,
+  units: Arc<str>,
   #[getset(get = "pub")]
-  group: Option<Rc<str>>,
+  group: Option<Arc<str>>,
 }
 
 #[derive(Clone, Debug, Getters, new, Serialize, Deserialize)]
 pub struct HistogramEntry {
   #[getset(get = "pub")]
-  name: Rc<str>,
+  name: Arc<str>,
   #[getset(get = "pub")]
   value: f64,
 }
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/utils.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/utils.rs
index d2316180f..4c49a8e1d 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/utils.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/utils.rs
@@ -6,9 +6,9 @@ use crate::{
   features::discovery::timeline::discovery::LogThreadsDiagramError,
 };
 use chrono::{DateTime, Utc};
-use std::rc::Rc;
+use std::sync::Arc;
 
-pub fn extract_thread_id<TEvent: Event>(event: &TEvent, thread_attribute: &str) -> Option<Rc<str>> {
+pub fn extract_thread_id<TEvent: Event>(event: &TEvent, thread_attribute: &str) -> Option<Arc<str>> {
   let value = event.payload_map()?.get(thread_attribute)?;
   Some(value.to_string_repr().clone())
 }
diff --git a/Ficus/src/rust/ficus/src/features/mutations/mutations.rs b/Ficus/src/rust/ficus/src/features/mutations/mutations.rs
index 35adc2b73..1ff6964e6 100644
--- a/Ficus/src/rust/ficus/src/features/mutations/mutations.rs
+++ b/Ficus/src/rust/ficus/src/features/mutations/mutations.rs
@@ -1,7 +1,8 @@
 use crate::event_log::core::{event::event::Event, event_log::EventLog, trace::trace::Trace};
 use std::{cell::RefCell, rc::Rc};
+use std::sync::Arc;
 
-pub fn rename_events<TLog, TFilter>(log: &mut TLog, new_name: Rc<str>, filter: TFilter)
+pub fn rename_events<TLog, TFilter>(log: &mut TLog, new_name: Arc<str>, filter: TFilter)
 where
   TLog: EventLog,
   TFilter: Fn(&TLog::TEvent) -> bool,
@@ -25,10 +26,10 @@ pub fn add_artificial_start_end_activities<TLog: EventLog>(
   log: &mut TLog,
   add_start_events: bool,
   add_end_events: bool,
-  attributes_to_copy: Option<&Vec<Rc<str>>>,
+  attributes_to_copy: Option<&Vec<Arc<str>>>,
 ) {
-  let art_start_name = Rc::<str>::from(ARTIFICIAL_START_EVENT_NAME);
-  let art_end_name = Rc::<str>::from(ARTIFICIAL_END_EVENT_NAME);
+  let art_start_name = Arc::<str>::from(ARTIFICIAL_START_EVENT_NAME);
+  let art_end_name = Arc::<str>::from(ARTIFICIAL_END_EVENT_NAME);
 
   for trace in log.traces() {
     let mut trace = trace.borrow_mut();
@@ -76,7 +77,7 @@ pub fn add_artificial_start_end_activities<TLog: EventLog>(
   }
 }
 
-fn copy_payload<TLog: EventLog>(from: &TLog::TEvent, to: &mut TLog::TEvent, attributes_to_copy: Option<&Vec<Rc<str>>>) {
+fn copy_payload<TLog: EventLog>(from: &TLog::TEvent, to: &mut TLog::TEvent, attributes_to_copy: Option<&Vec<Arc<str>>>) {
   let Some(attributes_to_copy) = attributes_to_copy else { return };
   let Some(payload_map) = from.payload_map() else { return };
 
@@ -86,7 +87,7 @@ fn copy_payload<TLog: EventLog>(from: &TLog::TEvent, to: &mut TLog::TEvent, attr
   }
 }
 
-pub fn append_attributes_to_name<TLog: EventLog>(log: &mut TLog, attributes: &Vec<Rc<str>>) {
+pub fn append_attributes_to_name<TLog: EventLog>(log: &mut TLog, attributes: &Vec<Arc<str>>) {
   log.mutate_events(|event| {
     let mut new_name = event.name().to_owned();
     let payload = event.payload_map();
@@ -105,6 +106,6 @@ pub fn append_attributes_to_name<TLog: EventLog>(log: &mut TLog, attributes: &Ve
       new_name += format!("_{}", attribute_value_string).as_str();
     }
 
-    event.set_name(Rc::from(new_name));
+    event.set_name(Arc::from(new_name));
   })
 }
diff --git a/Ficus/src/rust/ficus/src/features/streaming/counters/sliding_window.rs b/Ficus/src/rust/ficus/src/features/streaming/counters/sliding_window.rs
index 48002eeba..c553a7bb6 100644
--- a/Ficus/src/rust/ficus/src/features/streaming/counters/sliding_window.rs
+++ b/Ficus/src/rust/ficus/src/features/streaming/counters/sliding_window.rs
@@ -1,6 +1,7 @@
 use crate::features::streaming::counters::core::{StreamingCounter, StreamingCounterEntry, ValueUpdateKind};
 use chrono::{DateTime, Utc};
 use std::{collections::HashMap, hash::Hash, ops::Add, rc::Rc, time::Duration};
+use std::sync::Arc;
 
 #[derive(Clone)]
 struct SlidingWindowEntry<TValue: Clone> {
@@ -29,7 +30,7 @@ pub enum InvalidationResult {
   Retain,
 }
 
-pub type Invalidator<TValue> = Rc<Box<dyn Fn(Option<&TValue>, &DateTime<Utc>) -> InvalidationResult>>;
+pub type Invalidator<TValue> = Arc<Box<dyn Fn(Option<&TValue>, &DateTime<Utc>) -> InvalidationResult>>;
 
 #[derive(Clone)]
 pub struct SlidingWindow<TKey: Hash + Eq + Clone, TValue: Clone> {
@@ -83,7 +84,7 @@ impl<TKey: Hash + Eq + Clone, TValue: Clone> SlidingWindow<TKey, TValue> {
   pub fn new_time(invalidation_duration: Duration) -> Self {
     Self {
       storage: HashMap::new(),
-      invalidator: Rc::new(Box::new(move |_, stamp| match stamp.add(invalidation_duration) < Utc::now() {
+      invalidator: Arc::new(Box::new(move |_, stamp| match stamp.add(invalidation_duration) < Utc::now() {
         true => InvalidationResult::Invalidate,
         false => InvalidationResult::Retain,
       })),
diff --git a/Ficus/src/rust/ficus/src/pipelines/activities_parts.rs b/Ficus/src/rust/ficus/src/pipelines/activities_parts.rs
index 8d848d320..aed0d4d0d 100644
--- a/Ficus/src/rust/ficus/src/pipelines/activities_parts.rs
+++ b/Ficus/src/rust/ficus/src/pipelines/activities_parts.rs
@@ -43,6 +43,7 @@ use crate::{
 };
 use chrono::TimeDelta;
 use std::{cell::RefCell, collections::HashMap, path::Path, rc::Rc, str::FromStr};
+use std::sync::Arc;
 
 pub enum UndefActivityHandlingStrategyDto {
   DontInsert,
@@ -156,7 +157,7 @@ impl PipelineParts {
     let strategy = match undef_activity_strat {
       UndefActivityHandlingStrategyDto::DontInsert => UndefActivityHandlingStrategy::DontInsert,
       UndefActivityHandlingStrategyDto::InsertAsSingleEvent => UndefActivityHandlingStrategy::InsertAsSingleEvent(Box::new(|| {
-        Rc::new(RefCell::new(XesEventImpl::new_with_min_date(Rc::from(
+        Rc::new(RefCell::new(XesEventImpl::new_with_min_date(Arc::from(
           UNDEF_ACTIVITY_NAME.to_owned(),
         ))))
       })),
@@ -423,7 +424,7 @@ impl PipelineParts {
   fn create_activities_to_logs(
     context: &mut PipelineContext,
     config: &UserDataImpl,
-  ) -> Result<HashMap<Rc<str>, Rc<RefCell<XesEventLogImpl>>>, PipelinePartExecutionError> {
+  ) -> Result<HashMap<Arc<str>, Rc<RefCell<XesEventLogImpl>>>, PipelinePartExecutionError> {
     let log = Self::get_user_data(context, &EVENT_LOG_KEY)?;
     let dto = Self::get_user_data(config, &ACTIVITIES_LOGS_SOURCE_KEY)?;
 
@@ -487,7 +488,7 @@ impl PipelineParts {
         drop(borrowed_event);
 
         if start == 0 {
-          let new_name = Rc::from(event.borrow().name()[start..end].to_owned());
+          let new_name = Arc::from(event.borrow().name()[start..end].to_owned());
           event.borrow_mut().set_name(new_name);
         }
       }
@@ -568,7 +569,7 @@ impl PipelineParts {
           }
 
           for update in updates {
-            let new_key = Rc::from(format!("{}{}", HIERARCHY_LEVEL, update.0));
+            let new_key = Arc::from(format!("{}{}", HIERARCHY_LEVEL, update.0));
             event.payload_map_mut().unwrap().insert(new_key, update.1);
           }
         }
diff --git a/Ficus/src/rust/ficus/src/pipelines/drawing_parts.rs b/Ficus/src/rust/ficus/src/pipelines/drawing_parts.rs
index 37ccc11bc..614c82190 100644
--- a/Ficus/src/rust/ficus/src/pipelines/drawing_parts.rs
+++ b/Ficus/src/rust/ficus/src/pipelines/drawing_parts.rs
@@ -19,6 +19,7 @@ use crate::{
 };
 use fancy_regex::Regex;
 use std::{collections::HashMap, rc::Rc};
+use std::sync::Arc;
 
 impl PipelineParts {
   pipeline_part!(traces_diversity_diagram, |context: &mut PipelineContext, _, _| {
@@ -34,7 +35,7 @@ impl PipelineParts {
   fn create_traces_diversity_colors_log(
     log: &XesEventLogImpl,
     colors_holder: &mut ColorsHolder,
-    color_key_selector: impl Fn(&XesEventImpl) -> Rc<str>,
+    color_key_selector: impl Fn(&XesEventImpl) -> Arc<str>,
   ) -> ColorsEventLog {
     let mut mapping = HashMap::new();
     let mut traces = vec![];
@@ -78,7 +79,7 @@ impl PipelineParts {
 
     let mut traces = vec![];
     let mut mapping = HashMap::new();
-    mapping.insert(Rc::from(UNDEF_ACTIVITY_NAME.to_owned()), Color::black());
+    mapping.insert(Arc::from(UNDEF_ACTIVITY_NAME.to_owned()), Color::black());
 
     for trace in log.traces() {
       let mut colors_trace = vec![];
@@ -95,7 +96,7 @@ impl PipelineParts {
           let name = event.name_pointer().clone();
           colors_trace.push(ColoredRectangle::square(name, index as f64));
         } else {
-          let name = Rc::from(UNDEF_ACTIVITY_NAME.to_owned());
+          let name = Arc::from(UNDEF_ACTIVITY_NAME.to_owned());
           colors_trace.push(ColoredRectangle::square(name, index as f64));
         }
       }
@@ -124,7 +125,7 @@ impl PipelineParts {
 
     let mut traces = vec![];
     let mut mapping = HashMap::new();
-    mapping.insert(Rc::from(UNDEF_ACTIVITY_NAME), Color::black());
+    mapping.insert(Arc::from(UNDEF_ACTIVITY_NAME), Color::black());
 
     for (activities, trace) in traces_activities.iter().zip(log.traces().iter()) {
       let mut colors_trace = vec![];
@@ -142,7 +143,7 @@ impl PipelineParts {
         }
         SubTraceKind::Unattached(start_pos, length) => {
           colors_trace.push(ColoredRectangle::new(
-            Rc::from(UNDEF_ACTIVITY_NAME.to_string()),
+            Arc::from(UNDEF_ACTIVITY_NAME.to_string()),
             start_pos as f64,
             length as f64,
           ));
@@ -164,7 +165,7 @@ impl PipelineParts {
 
     let mut traces = vec![];
     let mut mapping = HashMap::new();
-    mapping.insert(Rc::<str>::from(UNDEF_ACTIVITY_NAME), Color::black());
+    mapping.insert(Arc::<str>::from(UNDEF_ACTIVITY_NAME), Color::black());
 
     for (activities, trace) in traces_activities.iter().zip(log.traces().iter()) {
       let mut colors_trace = vec![];
@@ -184,7 +185,7 @@ impl PipelineParts {
             colors_trace.push(ColoredRectangle::new(name.clone(), index as f64, 1.));
           }
           SubTraceKind::Unattached(_, _) => {
-            let ptr = Rc::from(UNDEF_ACTIVITY_NAME.to_owned());
+            let ptr = Arc::from(UNDEF_ACTIVITY_NAME.to_owned());
             colors_trace.push(ColoredRectangle::new(ptr, index as f64, 1.));
           }
         }
@@ -214,7 +215,7 @@ impl PipelineParts {
           return value.to_string_repr();
         }
 
-        Rc::from("UNDEF_ATTRIBUTE".to_string())
+        Arc::from("UNDEF_ATTRIBUTE".to_string())
       });
 
       context.put_concrete(COLORS_EVENT_LOG_KEY.key(), colors_log);
diff --git a/Ficus/src/rust/ficus/src/pipelines/keys/context_keys.rs b/Ficus/src/rust/ficus/src/pipelines/keys/context_keys.rs
index 266ee91a7..5aa78910c 100644
--- a/Ficus/src/rust/ficus/src/pipelines/keys/context_keys.rs
+++ b/Ficus/src/rust/ficus/src/pipelines/keys/context_keys.rs
@@ -37,6 +37,7 @@ use crate::{
 use bxes::models::system_models::SystemMetadata;
 use lazy_static::lazy_static;
 use std::{cell::RefCell, collections::HashMap, ops::Deref, rc::Rc};
+use std::sync::Arc;
 use uuid::Uuid;
 
 pub const CASE_NAME: &str = "case_name";
@@ -156,25 +157,25 @@ context_key! { ACTIVITIES, Vec<Rc<RefCell<ActivityNode>>> }
 context_key! { REPEAT_SETS, Vec<SubArrayWithTraceIndex> }
 context_key! { TRACE_ACTIVITIES, Vec<Vec<ActivityInTraceInfo>> }
 context_key! { PATTERNS, Vec<Vec<SubArrayInTraceInfo>> }
-context_key! { ACTIVITIES_TO_LOGS, HashMap<Rc<str>, XesEventLogImpl> }
-context_key! { ACTIVITY_NAME, Rc<str> }
+context_key! { ACTIVITIES_TO_LOGS, HashMap<Arc<str>, XesEventLogImpl> }
+context_key! { ACTIVITY_NAME, Arc<str> }
 context_key! { HASHES_EVENT_LOG, Vec<Vec<u64>> }
-context_key! { NAMES_EVENT_LOG, Vec<Vec<Rc<str>>> }
+context_key! { NAMES_EVENT_LOG, Vec<Vec<Arc<str>>> }
 context_key! { TANDEM_ARRAY_LENGTH, u32 }
 context_key! { ACTIVITY_LEVEL, u32 }
 context_key! { NARROW_ACTIVITIES, ActivityNarrowingKind }
-context_key! { EVENT_NAME, Rc<str> }
-context_key! { REGEX, Rc<str> }
+context_key! { EVENT_NAME, Arc<str> }
+context_key! { REGEX, Arc<str> }
 context_key! { COLORS_EVENT_LOG, ColorsEventLog }
 context_key! { COLORS_HOLDER, ColorsHolder }
 context_key! { PATTERNS_DISCOVERY_STRATEGY, PatternsDiscoveryStrategy }
-context_key! { OUTPUT_STRING, Rc<str> }
+context_key! { OUTPUT_STRING, Arc<str> }
 context_key! { EVENT_LOG_INFO, OfflineEventLogInfo }
 context_key! { UNDERLYING_EVENTS_COUNT, usize }
 context_key! { EVENTS_COUNT, u32 }
-context_key! { REGEXES, Vec<Rc<str>> }
+context_key! { REGEXES, Vec<Arc<str>> }
 context_key! { ADJUSTING_MODE, AdjustingMode }
-context_key! { EVENT_CLASS_REGEX, Rc<str> }
+context_key! { EVENT_CLASS_REGEX, Arc<str> }
 context_key! { PATTERNS_KIND, PatternsKindDto }
 context_key! { PIPELINE, Pipeline }
 context_key! { MIN_ACTIVITY_LENGTH, u32 }
@@ -209,32 +210,32 @@ context_key! { LABELED_TRACES_ACTIVITIES_DATASET, LabeledDataset }
 context_key! { ACTIVITIES_REPR_SOURCE, ActivityRepresentationSource }
 context_key! { DISTANCE, FicusDistance }
 context_key! { EXECUTE_ONLY_ON_LAST_EXTRACTION, bool }
-context_key! { EVENT_LOG_NAME, Rc<str> }
+context_key! { EVENT_LOG_NAME, Arc<str> }
 context_key! { LOG_TRACES_DATASET, FicusDataset }
 context_key! { LABELED_LOG_TRACES_DATASET, LabeledDataset }
 context_key! { TRACES_REPR_SOURCE, TracesRepresentationSource }
 context_key! { SYSTEM_METADATA, SystemMetadata }
 context_key! { LOG_SERIALIZATION_FORMAT, LogSerializationFormat }
 context_key! { BYTES, Vec<u8> }
-context_key! { PATH, Rc<str> }
+context_key! { PATH, Arc<str> }
 context_key! { CASE_NAME, CaseName }
-context_key! { PROCESS_NAME, Rc<str> }
-context_key! { PIPELINE_NAME, Rc<str> }
+context_key! { PROCESS_NAME, Arc<str> }
+context_key! { PIPELINE_NAME, Arc<str> }
 context_key! { PIPELINE_ID, Uuid }
-context_key! { SUBSCRIPTION_NAME, Rc<str> }
+context_key! { SUBSCRIPTION_NAME, Arc<str> }
 context_key! { SUBSCRIPTION_ID, Uuid }
-context_key! { UNSTRUCTURED_METADATA, Vec<(Rc<str>, Rc<str>)> }
-context_key! { START_CASE_REGEX, Rc<str> }
-context_key! { END_CASE_REGEX, Rc<str> }
+context_key! { UNSTRUCTURED_METADATA, Vec<(Arc<str>, Arc<str>)> }
+context_key! { START_CASE_REGEX, Arc<str> }
+context_key! { END_CASE_REGEX, Arc<str> }
 context_key! { INLINE_INNER_CASES, bool }
 context_key! { GRAPH_TIME_ANNOTATION, HashMap<u64, f64> }
-context_key! { ATTRIBUTE, Rc<str> }
+context_key! { ATTRIBUTE, Arc<str> }
 context_key! { TIME_ANNOTATION_KIND, TimeAnnotationKind }
-context_key! { ATTRIBUTES, Vec<Rc<str>> }
-context_key! { PATHS, Vec<Rc<str>> }
+context_key! { ATTRIBUTES, Vec<Arc<str>> }
+context_key! { PATHS, Vec<Arc<str>> }
 context_key! { LOG_THREADS_DIAGRAM, LogTimelineDiagram }
-context_key! { THREAD_ATTRIBUTE, Rc<str> }
-context_key! { TIME_ATTRIBUTE, Rc<str> }
+context_key! { THREAD_ATTRIBUTE, Arc<str> }
+context_key! { TIME_ATTRIBUTE, Arc<str> }
 context_key! { TIME_DELTA, u32 }
 context_key! { FEATURE_COUNT_KIND, FeatureCountKindDto }
 context_key! { PERCENT_FROM_MAX_VALUE, f64 }
diff --git a/Ficus/src/rust/ficus/src/pipelines/multithreading.rs b/Ficus/src/rust/ficus/src/pipelines/multithreading.rs
index 0c608cd60..6b67ac46a 100644
--- a/Ficus/src/rust/ficus/src/pipelines/multithreading.rs
+++ b/Ficus/src/rust/ficus/src/pipelines/multithreading.rs
@@ -42,6 +42,7 @@ use crate::{
 };
 use fancy_regex::Regex;
 use std::{cell::RefCell, collections::HashMap, rc::Rc, str::FromStr};
+use std::sync::Arc;
 
 #[derive(Copy, Clone)]
 pub enum FeatureCountKindDto {
@@ -125,7 +126,7 @@ impl PipelineParts {
     Ok(enumerate_event_groups(timeline))
   }
 
-  fn extract_thread_and_time_attribute(context: &PipelineContext) -> Result<(Rc<str>, Option<Rc<str>>), PipelinePartExecutionError> {
+  fn extract_thread_and_time_attribute(context: &PipelineContext) -> Result<(Arc<str>, Option<Arc<str>>), PipelinePartExecutionError> {
     let timeline = Self::get_user_data(context, &LOG_THREADS_DIAGRAM_KEY)?;
     Ok((timeline.thread_attribute().clone(), timeline.time_attribute().clone()))
   }
@@ -135,8 +136,8 @@ impl PipelineParts {
     context: &mut PipelineContext,
     config: &UserDataImpl,
     infra: &PipelineInfrastructure,
-    thread_attribute: &Rc<str>,
-    time_attribute: Option<&Rc<str>>,
+    thread_attribute: &Arc<str>,
+    time_attribute: Option<&Arc<str>>,
   ) -> Result<(), PipelinePartExecutionError> {
     let extraction_config = Self::get_software_data_extraction_config(context);
     let events_groups_log = Self::create_groups_event_log(&events_groups);
@@ -279,7 +280,7 @@ impl PipelineParts {
             if let Some(map) = event.payload_map_mut()
               && let Some(type_name) = map.get_mut(config.info().type_name_attr().as_ref())
             {
-              *type_name = EventPayloadValue::String(Rc::from(Self::shorten_type_or_method_name(type_name.to_string_repr().as_ref())));
+              *type_name = EventPayloadValue::String(Arc::from(Self::shorten_type_or_method_name(type_name.to_string_repr().as_ref())));
             }
           }
         }
@@ -337,10 +338,10 @@ impl PipelineParts {
   pipeline_part!(shorten_method_names, |context: &mut PipelineContext, _, _| {
     let log = Self::get_user_data_mut(context, &EVENT_LOG_KEY)?;
 
-    let methods_id_factories: Vec<&dyn Fn(&Rc<str>, &Rc<str>, &Rc<str>) -> Rc<str>> = vec![
+    let methods_id_factories: Vec<&dyn Fn(&Arc<str>, &Arc<str>, &Arc<str>) -> Arc<str>> = vec![
       &|_, name, _| name.to_owned(),
-      &|_, name, signature| Rc::from(name.as_ref().to_owned() + signature.as_ref()),
-      &|namespace, name, _| Rc::from(namespace.to_string() + name),
+      &|_, name, signature| Arc::from(name.as_ref().to_owned() + signature.as_ref()),
+      &|namespace, name, _| Arc::from(namespace.to_string() + name),
     ];
 
     let configs = Self::create_processed_method_extraction_configs(context);
@@ -442,13 +443,13 @@ impl PipelineParts {
       return;
     };
 
-    event.set_name(Rc::from(shortened_name));
+    event.set_name(Arc::from(shortened_name));
   }
 
   fn extract_method_name_parts(
-    payload: &HashMap<Rc<str>, EventPayloadValue>,
+    payload: &HashMap<Arc<str>, EventPayloadValue>,
     config: &ProcessedMethodStartEndConfig,
-  ) -> Option<(Rc<str>, Rc<str>, Rc<str>)> {
+  ) -> Option<(Arc<str>, Arc<str>, Arc<str>)> {
     let namespace = payload.get(config.namespace_attr.as_ref()).map(|v| v.to_string_repr().clone())?;
     let name = payload.get(config.name_attr.as_ref()).map(|v| v.to_string_repr().clone())?;
     let signature = payload.get(config.signature_attr.as_ref()).map(|v| v.to_string_repr().clone())?;
@@ -459,7 +460,7 @@ impl PipelineParts {
   fn check_if_can_use_method_id(
     log: &XesEventLogImpl,
     config: &ProcessedMethodStartEndConfig,
-    method_id_factory: impl Fn(&Rc<str>, &Rc<str>, &Rc<str>) -> Rc<str>,
+    method_id_factory: impl Fn(&Arc<str>, &Arc<str>, &Arc<str>) -> Arc<str>,
   ) -> bool {
     let mut map = HashMap::new();
 
@@ -504,7 +505,7 @@ impl PipelineParts {
             {
               display_name = Some(match config.prefix.as_ref() {
                 None => name,
-                Some(prefix) => Rc::from(prefix.to_string() + name.as_ref()),
+                Some(prefix) => Arc::from(prefix.to_string() + name.as_ref()),
               });
             }
           }
@@ -584,8 +585,8 @@ impl PipelineParts {
 
 struct ProcessedMethodStartEndConfig {
   event_regex: Regex,
-  namespace_attr: Rc<str>,
-  name_attr: Rc<str>,
-  signature_attr: Rc<str>,
-  prefix: Option<Rc<str>>,
+  namespace_attr: Arc<str>,
+  name_attr: Arc<str>,
+  signature_attr: Arc<str>,
+  prefix: Option<Arc<str>>,
 }
diff --git a/Ficus/src/rust/ficus/src/utils/colors.rs b/Ficus/src/rust/ficus/src/utils/colors.rs
index 51e6238ce..baa71fd44 100644
--- a/Ficus/src/rust/ficus/src/utils/colors.rs
+++ b/Ficus/src/rust/ficus/src/utils/colors.rs
@@ -1,8 +1,8 @@
 use rand::Rng;
 use std::{
   collections::{HashMap, HashSet},
-  rc::Rc,
 };
+use std::sync::Arc;
 
 #[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)]
 pub struct Color {
@@ -52,12 +52,12 @@ impl Color {
 
 #[derive(Default)]
 pub struct ColorsHolder {
-  names_to_colors: HashMap<Rc<str>, Color>,
+  names_to_colors: HashMap<Arc<str>, Color>,
   used_colors: HashSet<Color>,
 }
 
 impl ColorsHolder {
-  pub fn get_or_create(&mut self, name: &Rc<str>) -> Color {
+  pub fn get_or_create(&mut self, name: &Arc<str>) -> Color {
     if let Some(existing_color) = self.names_to_colors.get(name) {
       *existing_color
     } else {
@@ -70,22 +70,22 @@ impl ColorsHolder {
 }
 
 pub struct ColorsEventLog {
-  pub mapping: HashMap<Rc<str>, Color>,
+  pub mapping: HashMap<Arc<str>, Color>,
   pub traces: Vec<Vec<ColoredRectangle>>,
 }
 
 pub struct ColoredRectangle {
-  name: Rc<str>,
+  name: Arc<str>,
   start_x: f64,
   length: f64,
 }
 
 impl ColoredRectangle {
-  pub fn new(name: Rc<str>, start_x: f64, length: f64) -> Self {
+  pub fn new(name: Arc<str>, start_x: f64, length: f64) -> Self {
     Self { name, start_x, length }
   }
 
-  pub fn square(name: Rc<str>, start_pos: f64) -> Self {
+  pub fn square(name: Arc<str>, start_pos: f64) -> Self {
     Self::new(name, start_pos, 1.)
   }
 
diff --git a/Ficus/src/rust/ficus/src/utils/display_name.rs b/Ficus/src/rust/ficus/src/utils/display_name.rs
index f8dbd0768..d7757ac0e 100644
--- a/Ficus/src/rust/ficus/src/utils/display_name.rs
+++ b/Ficus/src/rust/ficus/src/utils/display_name.rs
@@ -4,12 +4,12 @@ use crate::{
   utils::user_data::user_data::{UserData, UserDataOwner},
 };
 use lazy_static::lazy_static;
-use std::rc::Rc;
+use std::sync::Arc;
 
 const DISPLAY_NAME: &str = "DISPLAY_NAME";
-context_key! { DISPLAY_NAME, Rc<str> }
+context_key! { DISPLAY_NAME, Arc<str> }
 
-pub fn get_display_name(event: &XesEventImpl) -> Rc<str> {
+pub fn get_display_name(event: &XesEventImpl) -> Arc<str> {
   match event.user_data().concrete(DISPLAY_NAME_KEY.key()) {
     None => event.name_pointer().clone(),
     Some(name) => name.clone(),
diff --git a/Ficus/src/rust/ficus/src/utils/graph/graph.rs b/Ficus/src/rust/ficus/src/utils/graph/graph.rs
index f316fbb8e..ebd2a6ccf 100644
--- a/Ficus/src/rust/ficus/src/utils/graph/graph.rs
+++ b/Ficus/src/rust/ficus/src/utils/graph/graph.rs
@@ -3,10 +3,11 @@ use crate::utils::{
   user_data::user_data::UserDataImpl,
 };
 use getset::{Getters, Setters};
-use std::{collections::HashMap, fmt::Display, rc::Rc, sync::atomic::AtomicU64};
+use std::{collections::HashMap, fmt::Display, sync::atomic::AtomicU64};
+use std::sync::Arc;
 
 pub(crate) static NEXT_ID: AtomicU64 = AtomicU64::new(0);
-pub type DefaultGraph = Graph<Rc<str>, Rc<str>>;
+pub type DefaultGraph = Graph<Arc<str>, Arc<str>>;
 
 pub struct NodesConnectionData<TEdgeData> {
   pub(super) data: Option<TEdgeData>,
diff --git a/Ficus/src/rust/ficus/src/utils/graph/graph_conversions.rs b/Ficus/src/rust/ficus/src/utils/graph/graph_conversions.rs
index 9557c9a11..97cccd3b3 100644
--- a/Ficus/src/rust/ficus/src/utils/graph/graph_conversions.rs
+++ b/Ficus/src/rust/ficus/src/utils/graph/graph_conversions.rs
@@ -3,7 +3,8 @@ use crate::utils::graph::{
   graph_edge::GraphEdge,
   graph_node::GraphNode,
 };
-use std::{collections::HashMap, fmt::Display, rc::Rc};
+use std::{collections::HashMap, fmt::Display};
+use std::sync::Arc;
 
 impl<TNodeData, TEdgeData> Graph<TNodeData, TEdgeData>
 where
@@ -20,13 +21,13 @@ where
   }
 
   #[rustfmt::skip]
-  fn to_default_graph_nodes(&self) -> HashMap<u64, GraphNode<Rc<str>>> {
+  fn to_default_graph_nodes(&self) -> HashMap<u64, GraphNode<Arc<str>>> {
         self.nodes.iter().map(|pair| {
             (
                 *pair.0,
                 GraphNode {
                     id: pair.1.id.to_owned(),
-                    data: pair.1.data.as_ref().map(|data| Rc::from(data.to_string())),
+                    data: pair.1.data.as_ref().map(|data| Arc::from(data.to_string())),
                     user_data: pair.1.user_data.clone()
                 },
             )
@@ -34,7 +35,7 @@ where
     }
 
   #[rustfmt::skip]
-  fn to_default_graph_connections(&self) -> HashMap<u64, HashMap<u64, GraphEdge<Rc<str>>>> {
+  fn to_default_graph_connections(&self) -> HashMap<u64, HashMap<u64, GraphEdge<Arc<str>>>> {
         self.connections.iter().map(|pair| {
             (
                 *pair.0,
@@ -45,7 +46,7 @@ where
                             pair.1.from_node,
                             pair.1.to_node,
                             pair.1.weight,
-                            pair.1.data().as_ref().map(|data| Rc::from(data.to_string())),
+                            pair.1.data().as_ref().map(|data| Arc::from(data.to_string())),
                             Some(pair.1.user_data.clone())
                         )
                     )
diff --git a/Ficus/src/rust/ficus/src/utils/references.rs b/Ficus/src/rust/ficus/src/utils/references.rs
index d9ee73d5a..8ce237e4e 100644
--- a/Ficus/src/rust/ficus/src/utils/references.rs
+++ b/Ficus/src/rust/ficus/src/utils/references.rs
@@ -5,6 +5,7 @@ use std::{
   ops::Deref,
   rc::Rc,
 };
+use std::sync::Arc;
 
 pub enum ReferenceOrOwned<'a, T> {
   Ref(&'a T),
@@ -23,7 +24,7 @@ impl<'a, T> Deref for ReferenceOrOwned<'a, T> {
 }
 
 pub enum HeapedOrOwned<T> {
-  Heaped(Rc<T>),
+  Heaped(Arc<T>),
   Owned(T),
 }
 
@@ -44,7 +45,7 @@ impl<'a, T: Deserialize<'a>> Deserialize<'a> for HeapedOrOwned<T> {
   where
     D: Deserializer<'a>,
   {
-    Ok(HeapedOrOwned::Heaped(Rc::new(T::deserialize(deserializer)?)))
+    Ok(HeapedOrOwned::Heaped(Arc::new(T::deserialize(deserializer)?)))
   }
 }
 
@@ -53,7 +54,7 @@ pub fn owned<T>(t: T) -> HeapedOrOwned<T> {
 }
 
 pub fn heaped<T>(t: T) -> HeapedOrOwned<T> {
-  HeapedOrOwned::Heaped(Rc::new(t))
+  HeapedOrOwned::Heaped(Arc::new(t))
 }
 
 impl<T> Deref for HeapedOrOwned<T> {
diff --git a/Ficus/src/rust/ficus/src/utils/vec_utils.rs b/Ficus/src/rust/ficus/src/utils/vec_utils.rs
index 956bd1312..2a7e68503 100644
--- a/Ficus/src/rust/ficus/src/utils/vec_utils.rs
+++ b/Ficus/src/rust/ficus/src/utils/vec_utils.rs
@@ -1,6 +1,6 @@
-use std::rc::Rc;
+use std::sync::Arc;
 
-pub fn sort_by_first<TValue>(vec: &mut Vec<(&Rc<str>, TValue)>) {
+pub fn sort_by_first<TValue>(vec: &mut Vec<(&Arc<str>, TValue)>) {
   vec.sort_by(|first, second| first.0.partial_cmp(second.0).unwrap());
 }
 
diff --git a/Ficus/src/rust/ficus/tests/analysis/analysis_tests.rs b/Ficus/src/rust/ficus/tests/analysis/analysis_tests.rs
index 9f3193a7f..3fb1fb788 100644
--- a/Ficus/src/rust/ficus/tests/analysis/analysis_tests.rs
+++ b/Ficus/src/rust/ficus/tests/analysis/analysis_tests.rs
@@ -14,8 +14,8 @@ use ficus::features::analysis::{
 };
 use std::{
   collections::{HashMap, HashSet},
-  rc::Rc,
 };
+use std::sync::Arc;
 
 #[test]
 fn test_dfg_info() {
@@ -60,7 +60,7 @@ fn test_dfg_entropy() {
 #[test]
 fn test_dfg_entropy_with_noise() {
   let log = create_log_from_filter_out_chaotic_events_with_noise();
-  let ignored_events = HashSet::from_iter(vec![Rc::from("d"), Rc::from("v")]);
+  let ignored_events = HashSet::from_iter(vec![Arc::from("d"), Arc::from("v")]);
 
   let entropies = calculate_default_dfg_entropy(&log, Some(&ignored_events));
   let expected = HashMap::from_iter(vec![
@@ -90,7 +90,7 @@ fn test_dfg_laplace_entropy() {
 #[test]
 fn test_dfg_laplace_entropy_with_noise() {
   let log = create_log_from_filter_out_chaotic_events_with_noise();
-  let ignored_events = HashSet::from_iter(vec![Rc::from("d"), Rc::from("v")]);
+  let ignored_events = HashSet::from_iter(vec![Arc::from("d"), Arc::from("v")]);
 
   let entropies = calculate_laplace_dfg_entropy(&log, Some(&ignored_events));
 
@@ -109,10 +109,10 @@ fn test_pos_entropy() {
   let log = create_log_from_filter_out_chaotic_events();
   let entropies = calculate_pos_entropies(&log, &None);
   let expected = HashMap::from_iter(vec![
-    (Rc::from("c"), 0.2211099839259014),
-    (Rc::from("b"), 0.2211099839259014),
-    (Rc::from("x"), 0.3230075074711545),
-    (Rc::from("a"), 0.0),
+    (Arc::from("c"), 0.2211099839259014),
+    (Arc::from("b"), 0.2211099839259014),
+    (Arc::from("x"), 0.3230075074711545),
+    (Arc::from("a"), 0.0),
   ]);
 
   assert_eq!(entropies, expected);
@@ -121,14 +121,14 @@ fn test_pos_entropy() {
 #[test]
 fn test_pos_entropy_with_noise() {
   let log = create_log_from_filter_out_chaotic_events_with_noise();
-  let ignored_events = HashSet::from_iter(vec![Rc::from("d"), Rc::from("v")]);
+  let ignored_events = HashSet::from_iter(vec![Arc::from("d"), Arc::from("v")]);
 
   let entropies = calculate_pos_entropies(&log, &Some(ignored_events));
   let expected = HashMap::from_iter(vec![
-    (Rc::from("c"), 0.2211099839259014),
-    (Rc::from("b"), 0.2211099839259014),
-    (Rc::from("x"), 0.3230075074711545),
-    (Rc::from("a"), 0.0),
+    (Arc::from("c"), 0.2211099839259014),
+    (Arc::from("b"), 0.2211099839259014),
+    (Arc::from("x"), 0.3230075074711545),
+    (Arc::from("a"), 0.0),
   ]);
 
   assert_eq!(entropies, expected);
@@ -139,10 +139,10 @@ fn test_pos_entropy_fast() {
   let log = create_log_from_filter_out_chaotic_events();
   let entropies = calculate_pos_entropies_fast(&log, None);
   let expected = HashMap::from_iter(vec![
-    (Rc::from("c"), 0.2211099839259014),
-    (Rc::from("b"), 0.2211099839259014),
-    (Rc::from("x"), 0.3230075074711545),
-    (Rc::from("a"), 0.0),
+    (Arc::from("c"), 0.2211099839259014),
+    (Arc::from("b"), 0.2211099839259014),
+    (Arc::from("x"), 0.3230075074711545),
+    (Arc::from("a"), 0.0),
   ]);
 
   assert_eq!(entropies, expected);
@@ -151,14 +151,14 @@ fn test_pos_entropy_fast() {
 #[test]
 fn test_pos_entropy_fast_with_noise() {
   let log = create_log_from_filter_out_chaotic_events_with_noise();
-  let ignored_events = HashSet::from_iter(vec![Rc::from("d"), Rc::from("v")]);
+  let ignored_events = HashSet::from_iter(vec![Arc::from("d"), Arc::from("v")]);
 
   let entropies = calculate_pos_entropies_fast(&log, Some(&ignored_events));
   let expected = HashMap::from_iter(vec![
-    (Rc::from("c"), 0.2211099839259014),
-    (Rc::from("b"), 0.2211099839259014),
-    (Rc::from("x"), 0.3230075074711545),
-    (Rc::from("a"), 0.0),
+    (Arc::from("c"), 0.2211099839259014),
+    (Arc::from("b"), 0.2211099839259014),
+    (Arc::from("x"), 0.3230075074711545),
+    (Arc::from("a"), 0.0),
   ]);
 
   assert_eq!(entropies, expected);
diff --git a/Ficus/src/rust/ficus/tests/analysis/patterns/activities_instances_tests.rs b/Ficus/src/rust/ficus/tests/analysis/patterns/activities_instances_tests.rs
index 10195afcc..8bba0f60a 100644
--- a/Ficus/src/rust/ficus/tests/analysis/patterns/activities_instances_tests.rs
+++ b/Ficus/src/rust/ficus/tests/analysis/patterns/activities_instances_tests.rs
@@ -18,6 +18,7 @@ use ficus::{
   vecs,
 };
 use std::{cell::RefCell, ops::Deref, rc::Rc};
+use std::sync::Arc;
 
 #[test]
 fn test_activity_instances() {
@@ -136,7 +137,7 @@ fn test_creating_new_log_from_activity_instances_insert_as_single_event() {
   execute_activities_discovery_test(
     create_log_from_taxonomy_of_patterns(),
     UndefActivityHandlingStrategy::InsertAsSingleEvent(Box::new(|| {
-      Rc::new(RefCell::new(XesEventImpl::new_with_min_date(Rc::from(
+      Rc::new(RefCell::new(XesEventImpl::new_with_min_date(Arc::from(
         UNDEF_ACTIVITY_NAME.to_string(),
       ))))
     })),
@@ -278,7 +279,7 @@ fn execute_activities_logs_creation_test(log: XesEventLogImpl, pattern_kind: Pat
   let mut activities_logs = activities_logs
     .iter()
     .map(|pair| (pair.0.to_owned(), pair.1.borrow().to_raw_vector()))
-    .collect::<Vec<(Rc<str>, Vec<Vec<String>>)>>();
+    .collect::<Vec<(Arc<str>, Vec<Vec<String>>)>>();
 
   activities_logs.sort_by(|first, second| first.0.cmp(&second.0));
 
diff --git a/Ficus/src/rust/ficus/tests/discovery/ecfg_discovery.rs b/Ficus/src/rust/ficus/tests/discovery/ecfg_discovery.rs
index ec8134654..cd2f0e748 100644
--- a/Ficus/src/rust/ficus/tests/discovery/ecfg_discovery.rs
+++ b/Ficus/src/rust/ficus/tests/discovery/ecfg_discovery.rs
@@ -8,7 +8,7 @@ use ficus::{
   utils::user_data::user_data::UserDataImpl,
   vecs,
 };
-use std::rc::Rc;
+use std::sync::Arc;
 use termgraph::{Config, DirectedGraph, ValueFormatter};
 
 #[test]
@@ -357,7 +357,7 @@ fn execute_ecfg_discovery_test(mut traces: Vec<Vec<String>>, gold_root_sequence:
   let root_sequence = discover_root_sequence(&traces, root_sequence_kind);
   assert_eq!(root_sequence, gold_root_sequence);
 
-  let name_extractor = |s: &String| Rc::from(s.to_owned());
+  let name_extractor = |s: &String| Arc::from(s.to_owned());
 
   let to_node_data_transfer = |_: &String, _: &mut UserDataImpl, _| {};
   let to_edge_data_transfer = |_: &String, _: &mut UserDataImpl| {};
diff --git a/Ficus/src/rust/ficus/tests/discovery/multithreaded_dfg_tests.rs b/Ficus/src/rust/ficus/tests/discovery/multithreaded_dfg_tests.rs
index cc1fd33bb..dd63c1473 100644
--- a/Ficus/src/rust/ficus/tests/discovery/multithreaded_dfg_tests.rs
+++ b/Ficus/src/rust/ficus/tests/discovery/multithreaded_dfg_tests.rs
@@ -10,6 +10,7 @@ use ficus::{
   features::discovery::multithreaded_dfg::dfg::{MultithreadedTracePartsCreationStrategy, discover_multithreaded_dfg},
 };
 use std::{cell::RefCell, rc::Rc};
+use std::sync::Arc;
 
 const TEST_THREAD_ID_ATTRIBUTE: &'static str = "TestThreadId";
 
@@ -71,9 +72,9 @@ fn create_multithreaded_event_log(raw_traces: Vec<Vec<Vec<&str>>>) -> XesEventLo
     let mut xes_trace = XesTraceImpl::default();
     for (thread, thread_index) in trace.iter().zip(0..trace.len()) {
       for event in thread {
-        let mut xes_event = XesEventImpl::new_with_max_date(Rc::from(event.to_string()));
+        let mut xes_event = XesEventImpl::new_with_max_date(Arc::from(event.to_string()));
         xes_event.add_or_update_payload(
-          Rc::from(TEST_THREAD_ID_ATTRIBUTE.to_string()),
+          Arc::from(TEST_THREAD_ID_ATTRIBUTE.to_string()),
           EventPayloadValue::Uint64(thread_index as u64),
         );
 
diff --git a/Ficus/src/rust/ficus/tests/mutations/mutations_tests.rs b/Ficus/src/rust/ficus/tests/mutations/mutations_tests.rs
index 7c9364f02..b68f1b8a2 100644
--- a/Ficus/src/rust/ficus/tests/mutations/mutations_tests.rs
+++ b/Ficus/src/rust/ficus/tests/mutations/mutations_tests.rs
@@ -13,6 +13,7 @@ use ficus::{
   },
 };
 use std::{cell::RefCell, collections::HashSet, rc::Rc, vec};
+use std::sync::Arc;
 
 #[test]
 fn test_removing_events() {
@@ -59,7 +60,7 @@ fn test_removing_events5() {
 #[test]
 fn test_renaming() {
   let mut log = create_simple_event_log();
-  rename_events(&mut log, Rc::from("D"), |event| event.name() == "A");
+  rename_events(&mut log, Arc::from("D"), |event| event.name() == "A");
 
   assert_eq!(log.to_raw_vector(), vec![vec!["D", "B", "C"], vec!["D", "B", "C"]])
 }
@@ -67,7 +68,7 @@ fn test_renaming() {
 #[test]
 fn test_renaming2() {
   let mut log = create_simple_event_log2();
-  rename_events(&mut log, Rc::from("D"), |_| true);
+  rename_events(&mut log, Arc::from("D"), |_| true);
 
   assert_eq!(
     log.to_raw_vector(),
@@ -84,7 +85,7 @@ fn test_renaming2() {
 #[test]
 fn test_renaming2_no_change() {
   let mut log = create_simple_event_log2();
-  rename_events(&mut log, Rc::from("D"), |_| false);
+  rename_events(&mut log, Arc::from("D"), |_| false);
 
   assert_eq!(log.to_raw_vector(), create_raw_event_log2());
 }
@@ -92,7 +93,7 @@ fn test_renaming2_no_change() {
 #[test]
 fn test_renaming3() {
   let mut log = create_simple_event_log3();
-  rename_events(&mut log, Rc::from("D"), |event| event.name() == "E");
+  rename_events(&mut log, Arc::from("D"), |event| event.name() == "E");
 
   assert_eq!(
     log.to_raw_vector(),
diff --git a/Ficus/src/rust/ficus/tests/other/test_simple_event_log.rs b/Ficus/src/rust/ficus/tests/other/test_simple_event_log.rs
index 170d99cdb..bbd7b9115 100644
--- a/Ficus/src/rust/ficus/tests/other/test_simple_event_log.rs
+++ b/Ficus/src/rust/ficus/tests/other/test_simple_event_log.rs
@@ -6,6 +6,7 @@ use ficus::event_log::{
   xes::{xes_event::XesEventImpl, xes_event_log::XesEventLogImpl},
 };
 use std::rc::Rc;
+use std::sync::Arc;
 
 #[test]
 fn test_simple_event_log_creation() {
@@ -17,7 +18,7 @@ fn test_simple_event_log_creation() {
 #[test]
 fn test_set_name() {
   let log = create_simple_event_log();
-  let value = Rc::<str>::from("ASDASD");
+  let value = Arc::<str>::from("ASDASD");
 
   execute_test_set_test(
     &log,
diff --git a/Ficus/src/rust/ficus/tests/software_data/extractors_tests.rs b/Ficus/src/rust/ficus/tests/software_data/extractors_tests.rs
index 526cf4621..f1f628d0d 100644
--- a/Ficus/src/rust/ficus/tests/software_data/extractors_tests.rs
+++ b/Ficus/src/rust/ficus/tests/software_data/extractors_tests.rs
@@ -22,6 +22,7 @@ use ficus::{
   },
 };
 use std::{cell::RefCell, rc::Rc};
+use std::sync::Arc;
 
 #[test]
 fn test_general_histogram() {
@@ -32,42 +33,42 @@ fn test_general_histogram() {
         create_event_with_attributes(
           "histogram_event".to_string(),
           vec![
-            ("type".into(), EventPayloadValue::String(Rc::from("type1".to_string()))),
+            ("type".into(), EventPayloadValue::String(Arc::from("type1".to_string()))),
             ("count".into(), EventPayloadValue::Float64(123.)),
           ],
         ),
         create_event_with_attributes(
           "histogram_event".to_string(),
           vec![
-            ("type".into(), EventPayloadValue::String(Rc::from("type2".to_string()))),
+            ("type".into(), EventPayloadValue::String(Arc::from("type2".to_string()))),
             ("count".into(), EventPayloadValue::Float32(123.)),
           ],
         ),
         create_event_with_attributes(
           "histogram_event".to_string(),
           vec![
-            ("type".into(), EventPayloadValue::String(Rc::from("type1".to_string()))),
+            ("type".into(), EventPayloadValue::String(Arc::from("type1".to_string()))),
             ("count".into(), EventPayloadValue::Uint64(123)),
           ],
         ),
         create_event_with_attributes(
           "unknown".to_string(),
           vec![
-            ("type".into(), EventPayloadValue::String(Rc::from("type1".to_string()))),
+            ("type".into(), EventPayloadValue::String(Arc::from("type1".to_string()))),
             ("count".into(), EventPayloadValue::Uint32(123)),
           ],
         ),
         create_event_with_attributes(
           "hst_event".to_string(),
           vec![
-            ("type".into(), EventPayloadValue::String(Rc::from("type1".to_string()))),
+            ("type".into(), EventPayloadValue::String(Arc::from("type1".to_string()))),
             ("count".into(), EventPayloadValue::Int64(123)),
           ],
         ),
         create_event_with_attributes(
           "hst_event".to_string(),
           vec![
-            ("type".into(), EventPayloadValue::String(Rc::from("type2".to_string()))),
+            ("type".into(), EventPayloadValue::String(Arc::from("type2".to_string()))),
             ("count".into(), EventPayloadValue::Int32(123)),
           ],
         ),
@@ -123,42 +124,42 @@ fn test_simple_counter() {
         create_event_with_attributes(
           "histogram_event".to_string(),
           vec![
-            ("type".into(), EventPayloadValue::String(Rc::from("type1".to_string()))),
+            ("type".into(), EventPayloadValue::String(Arc::from("type1".to_string()))),
             ("count".into(), EventPayloadValue::Float64(123.)),
           ],
         ),
         create_event_with_attributes(
           "histogram_event".to_string(),
           vec![
-            ("type".into(), EventPayloadValue::String(Rc::from("type2".to_string()))),
+            ("type".into(), EventPayloadValue::String(Arc::from("type2".to_string()))),
             ("count".into(), EventPayloadValue::Float32(123.)),
           ],
         ),
         create_event_with_attributes(
           "histogram_event".to_string(),
           vec![
-            ("type".into(), EventPayloadValue::String(Rc::from("type1".to_string()))),
+            ("type".into(), EventPayloadValue::String(Arc::from("type1".to_string()))),
             ("count".into(), EventPayloadValue::Uint64(123)),
           ],
         ),
         create_event_with_attributes(
           "unknown".to_string(),
           vec![
-            ("type".into(), EventPayloadValue::String(Rc::from("type1".to_string()))),
+            ("type".into(), EventPayloadValue::String(Arc::from("type1".to_string()))),
             ("count".into(), EventPayloadValue::Uint32(123)),
           ],
         ),
         create_event_with_attributes(
           "hst_event".to_string(),
           vec![
-            ("type".into(), EventPayloadValue::String(Rc::from("type1".to_string()))),
+            ("type".into(), EventPayloadValue::String(Arc::from("type1".to_string()))),
             ("count".into(), EventPayloadValue::Int64(123)),
           ],
         ),
         create_event_with_attributes(
           "hst_event".to_string(),
           vec![
-            ("type".into(), EventPayloadValue::String(Rc::from("type2".to_string()))),
+            ("type".into(), EventPayloadValue::String(Arc::from("type2".to_string()))),
             ("count".into(), EventPayloadValue::Int32(123)),
           ],
         ),
@@ -204,14 +205,14 @@ fn test_activities_duration() {
         create_event_with_attributes(
           "event_start".to_string(),
           vec![
-            ("activity_id".into(), EventPayloadValue::String(Rc::from("1".to_string()))),
+            ("activity_id".into(), EventPayloadValue::String(Arc::from("1".to_string()))),
             ("stamp".into(), EventPayloadValue::Int64(100)),
           ],
         ),
         create_event_with_attributes(
           "event_end".to_string(),
           vec![
-            ("activity_id".into(), EventPayloadValue::String(Rc::from("1".to_string()))),
+            ("activity_id".into(), EventPayloadValue::String(Arc::from("1".to_string()))),
             ("stamp".into(), EventPayloadValue::Int64(200)),
           ],
         ),
@@ -219,7 +220,7 @@ fn test_activities_duration() {
       vec![create_event_with_attributes(
         "event_end".to_string(),
         vec![
-          ("activity_id".into(), EventPayloadValue::String(Rc::from("2".to_string()))),
+          ("activity_id".into(), EventPayloadValue::String(Arc::from("2".to_string()))),
           ("stamp".into(), EventPayloadValue::Int64(300)),
         ],
       )],
@@ -312,58 +313,58 @@ pub fn test_ocel_data_extraction() {
         create_event_with_attributes(
           "ocel_allocate".to_string(),
           vec![
-            ("object_type".into(), EventPayloadValue::String(Rc::from("type1".to_string()))),
-            ("object_id".into(), EventPayloadValue::String(Rc::from("id_1".to_string()))),
+            ("object_type".into(), EventPayloadValue::String(Arc::from("type1".to_string()))),
+            ("object_id".into(), EventPayloadValue::String(Arc::from("id_1".to_string()))),
           ],
         ),
         create_event_with_attributes(
           "ocel_consume".to_string(),
           vec![
-            ("object_type".into(), EventPayloadValue::String(Rc::from("type1".to_string()))),
-            ("object_id".into(), EventPayloadValue::String(Rc::from("id_2".to_string()))),
+            ("object_type".into(), EventPayloadValue::String(Arc::from("type1".to_string()))),
+            ("object_id".into(), EventPayloadValue::String(Arc::from("id_2".to_string()))),
           ],
         ),
         create_event_with_attributes(
           "ocel_allocate".to_string(),
           vec![
-            ("object_type".into(), EventPayloadValue::String(Rc::from("type1".to_string()))),
-            ("object_id".into(), EventPayloadValue::String(Rc::from("id_3".to_string()))),
+            ("object_type".into(), EventPayloadValue::String(Arc::from("type1".to_string()))),
+            ("object_id".into(), EventPayloadValue::String(Arc::from("id_3".to_string()))),
           ],
         ),
         create_event_with_attributes(
           "unknown".to_string(),
           vec![
-            ("object_type".into(), EventPayloadValue::String(Rc::from("type1".to_string()))),
-            ("object_id".into(), EventPayloadValue::String(Rc::from("id_2123123".to_string()))),
+            ("object_type".into(), EventPayloadValue::String(Arc::from("type1".to_string()))),
+            ("object_id".into(), EventPayloadValue::String(Arc::from("id_2123123".to_string()))),
           ],
         ),
         create_event_with_attributes(
           "ocel_consume_produce".to_string(),
           vec![
-            ("object_type".into(), EventPayloadValue::String(Rc::from("type1".to_string()))),
-            ("object_id".into(), EventPayloadValue::String(Rc::from("id_2".to_string()))),
+            ("object_type".into(), EventPayloadValue::String(Arc::from("type1".to_string()))),
+            ("object_id".into(), EventPayloadValue::String(Arc::from("id_2".to_string()))),
             (
               "ocel_related_objects_ids".into(),
-              EventPayloadValue::String(Rc::from("1 2 3 4 5".to_string())),
+              EventPayloadValue::String(Arc::from("1 2 3 4 5".to_string())),
             ),
             (
               "ocel_related_objects_types".into(),
-              EventPayloadValue::String(Rc::from("T1 T2 T3 T4 T5".to_string())),
+              EventPayloadValue::String(Arc::from("T1 T2 T3 T4 T5".to_string())),
             ),
           ],
         ),
         create_event_with_attributes(
           "ocel_allocate_merge".to_string(),
           vec![
-            ("object_type".into(), EventPayloadValue::String(Rc::from("type1".to_string()))),
-            ("object_id".into(), EventPayloadValue::String(Rc::from("id_2".to_string()))),
+            ("object_type".into(), EventPayloadValue::String(Arc::from("type1".to_string()))),
+            ("object_id".into(), EventPayloadValue::String(Arc::from("id_2".to_string()))),
             (
               "ocel_action".into(),
-              EventPayloadValue::String(Rc::from("AllocateMerged".to_string())),
+              EventPayloadValue::String(Arc::from("AllocateMerged".to_string())),
             ),
             (
               "ocel_related_objects_ids".into(),
-              EventPayloadValue::String(Rc::from("1 2 3 4 5".to_string())),
+              EventPayloadValue::String(Arc::from("1 2 3 4 5".to_string())),
             ),
           ],
         ),
@@ -400,7 +401,7 @@ pub fn test_ocel_data_extraction() {
   )
 }
 
-fn create_event_with_attributes(name: String, attributes: Vec<(Rc<str>, EventPayloadValue)>) -> Rc<RefCell<XesEventImpl>> {
+fn create_event_with_attributes(name: String, attributes: Vec<(Arc<str>, EventPayloadValue)>) -> Rc<RefCell<XesEventImpl>> {
   Rc::new(RefCell::new(XesEventImpl::new_all_fields(
     name.into(),
     Utc::now(),
diff --git a/Ficus/src/rust/ficus/tests/utils/user_data_tests.rs b/Ficus/src/rust/ficus/tests/utils/user_data_tests.rs
index 1094069c1..a3cfc72bd 100644
--- a/Ficus/src/rust/ficus/tests/utils/user_data_tests.rs
+++ b/Ficus/src/rust/ficus/tests/utils/user_data_tests.rs
@@ -1,5 +1,5 @@
 use std::rc::Rc;
-
+use std::sync::Arc;
 use ficus::utils::user_data::{
   keys::DefaultKey,
   user_data::{UserData, UserDataImpl},
@@ -20,8 +20,8 @@ fn test_user_data() {
 
 #[test]
 fn test_user_data_two_keys() {
-  let first_key = DefaultKey::<Rc<Box<usize>>>::new("1".to_string());
-  let second_key = DefaultKey::<Rc<Box<usize>>>::new("2".to_string());
+  let first_key = DefaultKey::<Arc<Box<usize>>>::new("1".to_string());
+  let second_key = DefaultKey::<Arc<Box<usize>>>::new("2".to_string());
 
   let first_value = Rc::new(Box::new(123));
   let second_value = Rc::new(Box::new(321));
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/converters.rs b/Ficus/src/rust/ficus_backend/src/grpc/converters.rs
index 8f40bd45d..2f56dd173 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/converters.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/converters.rs
@@ -105,6 +105,7 @@ use nameof::name_of_type;
 use prost::{DecodeError, Message};
 use prost_types::Timestamp;
 use std::{any::Any, cell::RefCell, collections::HashMap, fmt::Display, rc::Rc, str::FromStr};
+use std::sync::Arc;
 use uuid::Uuid;
 
 use super::pipeline_executor::ServicePipelineExecutionContext;
@@ -120,7 +121,7 @@ pub(super) fn put_into_user_data(
   context: &ServicePipelineExecutionContext,
 ) {
   match value {
-    ContextValue::String(string) => user_data.put_any::<Rc<str>>(key, string.clone().into()),
+    ContextValue::String(string) => user_data.put_any::<Arc<str>>(key, string.clone().into()),
     ContextValue::HashesLog(_) => todo!(),
     ContextValue::NamesLog(grpc_log) => put_names_log_to_context(key, grpc_log, user_data),
     ContextValue::Uint32(number) => user_data.put_any::<u32>(key, *number),
@@ -162,7 +163,7 @@ pub(super) fn put_into_user_data(
       }
     }
     ContextValue::EventLogInfo(_) => todo!(),
-    ContextValue::Strings(strings) => user_data.put_any::<Vec<Rc<str>>>(key, strings.strings.iter().map(|s| s.clone().into()).collect()),
+    ContextValue::Strings(strings) => user_data.put_any::<Vec<Arc<str>>>(key, strings.strings.iter().map(|s| s.clone().into()).collect()),
     ContextValue::Pipeline(pipeline) => {
       let pipeline = context.with_pipeline(pipeline).to_pipeline();
       user_data.put_any::<Pipeline>(key, pipeline);
@@ -262,7 +263,7 @@ fn put_names_log_to_context(key: &dyn Key, grpc_log: &GrpcNamesEventLogContextVa
     names_log.push(trace);
   }
 
-  user_data.put_any::<Vec<Vec<Rc<str>>>>(key, names_log);
+  user_data.put_any::<Vec<Vec<Arc<str>>>>(key, names_log);
 }
 
 pub fn convert_to_grpc_context_value(key: &dyn ContextKey, value: &dyn Any) -> Option<GrpcContextValue> {
@@ -427,11 +428,11 @@ fn try_convert_to_grpc_graph_time_annotation(value: &dyn Any) -> Option<GrpcCont
 }
 
 fn try_convert_to_string_context_value(value: &dyn Any) -> Option<GrpcContextValue> {
-  if !value.is::<Rc<str>>() {
+  if !value.is::<Arc<str>>() {
     None
   } else {
     Some(GrpcContextValue {
-      context_value: Some(ContextValue::String(value.downcast_ref::<Rc<str>>().unwrap().to_string())),
+      context_value: Some(ContextValue::String(value.downcast_ref::<Arc<str>>().unwrap().to_string())),
     })
   }
 }
@@ -460,10 +461,10 @@ fn try_convert_to_hashes_event_log(value: &dyn Any) -> Option<GrpcContextValue>
 }
 
 fn try_convert_to_names_event_log(value: &dyn Any) -> Option<GrpcContextValue> {
-  if !value.is::<Vec<Vec<Rc<str>>>>() {
+  if !value.is::<Vec<Vec<Arc<str>>>>() {
     None
   } else {
-    let vec = value.downcast_ref::<Vec<Vec<Rc<str>>>>().unwrap();
+    let vec = value.downcast_ref::<Vec<Vec<Arc<str>>>>().unwrap();
     let mut traces = vec![];
     for trace in vec {
       let mut events = vec![];
@@ -1030,7 +1031,7 @@ fn convert_to_grpc_simple_counter_data(data: &SimpleCounterData) -> GrpcSimpleCo
   }
 }
 
-fn convert_to_grpc_histogram_entries(histogram: &HashMap<Rc<str>, usize>) -> Vec<GrpcHistogramEntry> {
+fn convert_to_grpc_histogram_entries(histogram: &HashMap<Arc<str>, usize>) -> Vec<GrpcHistogramEntry> {
   histogram
     .iter()
     .map(|(key, value)| GrpcHistogramEntry {
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/events/kafka_events_handler.rs b/Ficus/src/rust/ficus_backend/src/grpc/events/kafka_events_handler.rs
index 2f434e6bf..d881fa6e7 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/events/kafka_events_handler.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/events/kafka_events_handler.rs
@@ -10,7 +10,7 @@ use rdkafka::{
   error::KafkaError,
   producer::{BaseProducer, BaseRecord},
 };
-use std::rc::Rc;
+use std::sync::Arc;
 use uuid::Uuid;
 
 pub struct PipelineEventsProducer {
@@ -98,12 +98,12 @@ impl PipelineEventsHandler for KafkaEventsHandler {
 
 pub struct ProcessCaseMetadata {
   pub case_name: CaseName,
-  pub process_name: Rc<str>,
+  pub process_name: Arc<str>,
   pub subscription_id: Option<Uuid>,
-  pub subscription_name: Option<Rc<str>>,
+  pub subscription_name: Option<Arc<str>>,
   pub pipeline_id: Option<Uuid>,
-  pub pipeline_name: Option<Rc<str>>,
-  pub metadata: Vec<(Rc<str>, Rc<str>)>,
+  pub pipeline_name: Option<Arc<str>>,
+  pub metadata: Vec<(Arc<str>, Arc<str>)>,
 }
 
 impl ProcessCaseMetadata {
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
index 2a59d0be2..c7e55c098 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
@@ -26,7 +26,7 @@ use ficus::{
   utils::user_data::user_data::UserData,
 };
 use futures::Stream;
-use std::{pin::Pin, rc::Rc, sync::Arc};
+use std::{pin::Pin, sync::Arc};
 use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;
 use tonic::{Request, Response, Status};
@@ -239,7 +239,7 @@ impl GrpcKafkaService for GrpcKafkaServiceImpl {
 
       let request = request.get_ref();
       let case_info = request.case_info.as_ref().expect("Case info must be supplied");
-      let case_name: Rc<str> = case_info.case_name.clone().into();
+      let case_name: Arc<str> = case_info.case_name.clone().into();
       let process_name = case_info.process_name.clone();
       let pipeline_id = Uuid::parse_str(request.pipeline_id.as_ref().expect("Must be supplied").guid.as_str());
       let subscription_id = Uuid::parse_str(request.subscription_id.as_ref().expect("Must be supplied").guid.as_str());
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
index 466c3cc81..5ff5b1ef8 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
@@ -10,7 +10,6 @@ use ficus::{
   event_log::bxes::bxes_to_xes_converter::BxesToXesReadError,
   pipelines::{errors::pipeline_errors::PipelinePartExecutionError, pipeline_parts::PipelineParts},
 };
-use std::rc::Rc;
 use std::{
   collections::HashMap,
   fmt::{Debug, Display, Formatter},
@@ -102,14 +101,14 @@ impl KafkaConsumerCreationDto {
 pub(super) struct ExtractedTraceMetadata {
   pub process: ProcessMetadata,
   pub case: CaseMetadata,
-  pub unstructured_metadata: Vec<(Rc<str>, Rc<str>)>,
+  pub unstructured_metadata: Vec<(Arc<str>, Arc<str>)>,
 }
 
 unsafe impl Send for ExtractedTraceMetadata {}
 unsafe impl Sync for ExtractedTraceMetadata {}
 
 impl ExtractedTraceMetadata {
-  pub fn create_from(metadata: &HashMap<Rc<str>, Rc<BxesValue>>) -> Result<Self, XesFromBxesKafkaTraceCreatingError> {
+  pub fn create_from(metadata: &HashMap<Arc<str>, Arc<BxesValue>>) -> Result<Self, XesFromBxesKafkaTraceCreatingError> {
     Ok(ExtractedTraceMetadata {
       process: ProcessMetadata::create_from(metadata)?,
       case: CaseMetadata::create_from(metadata)?,
@@ -131,11 +130,11 @@ impl ExtractedTraceMetadata {
 }
 
 pub(super) struct ProcessMetadata {
-  pub process_name: Rc<str>,
+  pub process_name: Arc<str>,
 }
 
 impl ProcessMetadata {
-  pub fn create_from(metadata: &HashMap<Rc<str>, Rc<BxesValue>>) -> Result<Self, XesFromBxesKafkaTraceCreatingError> {
+  pub fn create_from(metadata: &HashMap<Arc<str>, Arc<BxesValue>>) -> Result<Self, XesFromBxesKafkaTraceCreatingError> {
     let process_name = string_value_or_err(metadata, KAFKA_PROCESS_NAME)?;
 
     Ok(Self { process_name })
@@ -144,17 +143,17 @@ impl ProcessMetadata {
 
 pub(super) struct CaseMetadata {
   pub case_id: Uuid,
-  pub case_display_name: Rc<str>,
-  pub case_name_parts: Vec<Rc<str>>,
-  pub case_name_parts_joined: Rc<str>,
+  pub case_display_name: Arc<str>,
+  pub case_name_parts: Vec<Arc<str>>,
+  pub case_name_parts_joined: Arc<str>,
 }
 
 impl CaseMetadata {
-  pub fn create_from(metadata: &HashMap<Rc<str>, Rc<BxesValue>>) -> Result<Self, XesFromBxesKafkaTraceCreatingError> {
+  pub fn create_from(metadata: &HashMap<Arc<str>, Arc<BxesValue>>) -> Result<Self, XesFromBxesKafkaTraceCreatingError> {
     let case_id = uuid_or_err(metadata, KAFKA_CASE_ID)?;
     let case_name_parts_joined = string_value_or_err(metadata, KAFKA_CASE_NAME_PARTS)?;
     let case_display_name = string_value_or_err(metadata, KAFKA_CASE_DISPLAY_NAME)?;
-    let case_name_parts: Vec<Rc<str>> = case_name_parts_joined
+    let case_name_parts: Vec<Arc<str>> = case_name_parts_joined
       .split(KAFKA_CASE_NAME_PARTS_SEPARATOR)
       .map(|s| s.to_string().into())
       .collect();
@@ -169,9 +168,9 @@ impl CaseMetadata {
 }
 
 pub(super) fn string_value_or_err(
-  metadata: &HashMap<Rc<str>, Rc<BxesValue>>,
+  metadata: &HashMap<Arc<str>, Arc<BxesValue>>,
   key_name: &str,
-) -> Result<Rc<str>, XesFromBxesKafkaTraceCreatingError> {
+) -> Result<Arc<str>, XesFromBxesKafkaTraceCreatingError> {
   let value = value_or_err(metadata, key_name)?;
 
   if let BxesValue::String(process_name) = value.as_ref() {
@@ -181,7 +180,7 @@ pub(super) fn string_value_or_err(
   }
 }
 
-fn value_or_err(metadata: &HashMap<Rc<str>, Rc<BxesValue>>, key: &str) -> Result<Rc<BxesValue>, XesFromBxesKafkaTraceCreatingError> {
+fn value_or_err(metadata: &HashMap<Arc<str>, Arc<BxesValue>>, key: &str) -> Result<Arc<BxesValue>, XesFromBxesKafkaTraceCreatingError> {
   if let Some(value) = metadata.get(key) {
     Ok(value.clone())
   } else {
@@ -189,7 +188,7 @@ fn value_or_err(metadata: &HashMap<Rc<str>, Rc<BxesValue>>, key: &str) -> Result
   }
 }
 
-pub(super) fn uuid_or_err(metadata: &HashMap<Rc<str>, Rc<BxesValue>>, key: &str) -> Result<Uuid, XesFromBxesKafkaTraceCreatingError> {
+pub(super) fn uuid_or_err(metadata: &HashMap<Arc<str>, Arc<BxesValue>>, key: &str) -> Result<Uuid, XesFromBxesKafkaTraceCreatingError> {
   let value = value_or_err(metadata, key)?;
   if let BxesValue::Guid(id) = value.as_ref() {
     Ok(*id)
@@ -198,7 +197,7 @@ pub(super) fn uuid_or_err(metadata: &HashMap<Rc<str>, Rc<BxesValue>>, key: &str)
   }
 }
 
-fn metadata_to_string_string_pairs(metadata: &HashMap<Rc<str>, Rc<BxesValue>>) -> Vec<(Rc<str>, Rc<str>)> {
+fn metadata_to_string_string_pairs(metadata: &HashMap<Arc<str>, Arc<BxesValue>>) -> Vec<(Arc<str>, Arc<str>)> {
   metadata
     .iter()
     .filter_map(|pair| {
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
index be49584ee..93bcee194 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
@@ -14,6 +14,7 @@ use ficus::pipelines::keys::context_keys::EVENT_LOG_INFO_KEY;
 use ficus::utils::user_data::user_data::UserData;
 use log::{debug, info, warn};
 use std::{cell::RefCell, collections::HashMap, hash::Hash, rc::Rc, time::Duration};
+use std::sync::Arc;
 use uuid::Uuid;
 
 #[derive(Clone)]
@@ -34,16 +35,16 @@ impl StreamingCounterFactory {
 #[derive(Clone)]
 struct DfgDataStructureBase {
   factory: StreamingCounterFactory,
-  processes_dfg: HashMap<Rc<str>, Rc<RefCell<dyn StreamingCounter<(Rc<str>, Rc<str>), ()>>>>,
-  traces_last_event_classes: Rc<RefCell<dyn StreamingCounter<Uuid, Rc<str>>>>,
-  event_classes_count: HashMap<Rc<str>, Rc<RefCell<dyn StreamingCounter<Rc<str>, ()>>>>,
+  processes_dfg: HashMap<Arc<str>, Rc<RefCell<dyn StreamingCounter<(Arc<str>, Arc<str>), ()>>>>,
+  traces_last_event_classes: Rc<RefCell<dyn StreamingCounter<Uuid, Arc<str>>>>,
+  event_classes_count: HashMap<Arc<str>, Rc<RefCell<dyn StreamingCounter<Arc<str>, ()>>>>,
 }
 
 unsafe impl Send for DfgDataStructureBase {}
 unsafe impl Sync for DfgDataStructureBase {}
 
 impl DfgDataStructureBase {
-  pub fn observe_dfg_relation(&mut self, process_name: &Rc<str>, relation: (Rc<str>, Rc<str>)) {
+  pub fn observe_dfg_relation(&mut self, process_name: &Arc<str>, relation: (Arc<str>, Arc<str>)) {
     debug!(
       "Observing relation, process: {}, relation: ({}, {})",
       process_name, &relation.0, &relation.1
@@ -57,7 +58,7 @@ impl DfgDataStructureBase {
       .observe(relation, ValueUpdateKind::DoNothing);
   }
 
-  pub fn observe_event_class(&mut self, process_name: &Rc<str>, event_class: Rc<str>) {
+  pub fn observe_event_class(&mut self, process_name: &Arc<str>, event_class: Arc<str>) {
     debug!("Observing event class, process: {}, event class: {}", process_name, event_class);
 
     self
@@ -68,7 +69,7 @@ impl DfgDataStructureBase {
       .observe(event_class, ValueUpdateKind::DoNothing);
   }
 
-  pub fn observe_last_trace_class(&self, case_id: Uuid, last_class: Rc<str>) {
+  pub fn observe_last_trace_class(&self, case_id: Uuid, last_class: Arc<str>) {
     debug!(
       "Observing last trace class, case id: {}, last class: {}",
       &case_id,
@@ -81,7 +82,7 @@ impl DfgDataStructureBase {
       .observe(case_id, ValueUpdateKind::Replace(last_class))
   }
 
-  pub fn last_seen_event_class(&self, case_id: &Uuid) -> Option<Rc<str>> {
+  pub fn last_seen_event_class(&self, case_id: &Uuid) -> Option<Arc<str>> {
     self
       .traces_last_event_classes
       .borrow()
@@ -157,7 +158,7 @@ impl DfgDataStructures {
 impl DfgDataStructures {
   pub fn process_bxes_trace(
     &mut self,
-    metadata: &HashMap<Rc<str>, Rc<BxesValue>>,
+    metadata: &HashMap<Arc<str>, Arc<BxesValue>>,
     xes_trace: &XesTraceImpl,
   ) -> Result<(), XesFromBxesKafkaTraceCreatingError> {
     if xes_trace.events().is_empty() {

From 62118df41ba38c95dbe548aaa1ef0880be1ef56a Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Wed, 6 May 2026 13:54:17 +0300
Subject: [PATCH 43/53] cargo fmt

---
 .../event_log/bxes/bxes_to_xes_converter.rs   | 23 +++++++------
 .../ficus/src/event_log/bxes/conversions.rs   |  2 +-
 .../event_log/bxes/xes_to_bxes_converter.rs   |  3 +-
 .../ficus/src/event_log/core/event/event.rs   |  3 +-
 .../src/event_log/core/event/event_base.rs    |  2 +-
 .../src/event_log/core/event/events_holder.rs |  3 +-
 .../ficus/src/event_log/core/log_iterator.rs  |  3 +-
 .../ficus/src/event_log/core/trace/trace.rs   |  3 +-
 .../ficus/src/event_log/xes/logs_merger.rs    |  3 +-
 .../xes/reader/file_xes_log_reader.rs         |  4 +--
 .../ficus/src/event_log/xes/reader/utils.rs   |  3 +-
 .../xes/reader/xes_log_trace_reader.rs        |  3 +-
 .../rust/ficus/src/event_log/xes/shared.rs    |  3 +-
 .../rust/ficus/src/event_log/xes/simple.rs    |  3 +-
 .../rust/ficus/src/event_log/xes/xes_event.rs | 12 +++----
 .../ficus/src/event_log/xes/xes_event_log.rs  |  3 +-
 .../analysis/directly_follows_graph.rs        |  3 +-
 .../features/analysis/entropy/dfg_entropy.rs  |  2 +-
 .../features/analysis/entropy/pos_entropy.rs  |  4 +--
 .../analysis/entropy/pos_entropy_fast.rs      |  4 +--
 .../src/features/analysis/entropy/shared.rs   |  2 +-
 .../features/analysis/log_info/dfg_info.rs    |  2 +-
 .../analysis/log_info/event_log_info.rs       |  2 +-
 .../log_info/log_info_creation_dto.rs         |  3 +-
 .../analysis/patterns/activity_instances.rs   |  2 +-
 .../analysis/patterns/entry_points.rs         |  3 +-
 .../features/analysis/patterns/repeat_sets.rs |  8 +++--
 .../analysis/patterns/strict_loops.rs         |  3 +-
 .../activities/activities_common.rs           |  6 ++--
 .../features/clustering/activities/merging.rs |  4 +--
 .../ficus/src/features/clustering/common.rs   |  6 ++--
 .../src/features/clustering/traces/common.rs  |  2 +-
 .../src/features/discovery/alpha/alpha.rs     |  2 +-
 .../alpha_plus_plus_nfc.rs                    |  2 +-
 .../alpha_plus_plus_nfc_triple.rs             |  7 ++--
 .../alpha_plus_plus_nfc/extended_alpha_set.rs |  2 +-
 .../alpha/alpha_plus_plus_nfc/w3_pair.rs      |  2 +-
 .../src/features/discovery/alpha/alpha_set.rs |  2 +-
 .../providers/alpha_plus_nfc_provider.rs      |  3 +-
 .../alpha/providers/alpha_plus_provider.rs    |  3 +-
 .../alpha/providers/alpha_sharp_provider.rs   |  3 +-
 .../features/discovery/ecfg/adjustments.rs    |  2 +-
 .../src/features/discovery/ecfg/discovery.rs  |  2 +-
 .../features/discovery/ecfg/discovery_xes.rs  |  3 +-
 .../features/discovery/ecfg/log_prepare.rs    |  3 +-
 .../features/discovery/fuzzy/fuzzy_miner.rs   |  2 +-
 .../discovery/heuristic/heuristic_miner.rs    |  2 +-
 .../discovery/heuristic/relations_provider.rs |  3 +-
 .../discovery/multithreaded_dfg/dfg.rs        |  2 +-
 .../discovery/ocel/graph_annotation.rs        |  2 +-
 .../discovery/petri_net/annotations.rs        |  3 +-
 .../features/discovery/petri_net/petri_net.rs |  3 +-
 .../features/discovery/petri_net/replay.rs    |  4 +--
 .../discovery/petri_net/transition.rs         |  2 +-
 .../discovery/timeline/abstraction.rs         |  3 +-
 .../features/discovery/timeline/discovery.rs  |  2 +-
 .../software_data/extraction_config.rs        |  3 +-
 .../extractors/activities_durations.rs        |  3 +-
 .../timeline/software_data/extractors/core.rs |  2 +-
 .../timeline/software_data/extractors/ocel.rs |  3 +-
 .../software_data/extractors/utils.rs         |  3 +-
 .../timeline/software_data/models.rs          |  3 +-
 .../ficus/src/features/mutations/mutations.rs |  3 +-
 .../streaming/counters/sliding_window.rs      |  3 +-
 .../ficus/src/pipelines/activities_parts.rs   |  3 +-
 .../rust/ficus/src/pipelines/drawing_parts.rs |  3 +-
 .../ficus/src/pipelines/keys/context_keys.rs  |  3 +-
 .../ficus/src/pipelines/multithreading.rs     |  3 +-
 Ficus/src/rust/ficus/src/utils/colors.rs      |  2 +-
 Ficus/src/rust/ficus/src/utils/graph/graph.rs |  7 ++--
 .../src/utils/graph/graph_conversions.rs      |  3 +-
 Ficus/src/rust/ficus/src/utils/references.rs  |  2 +-
 .../ficus/tests/analysis/analysis_tests.rs    |  2 +-
 .../patterns/activities_instances_tests.rs    |  3 +-
 .../discovery/multithreaded_dfg_tests.rs      |  3 +-
 .../ficus/tests/mutations/mutations_tests.rs  |  3 +-
 .../tests/other/test_simple_event_log.rs      |  3 +-
 .../tests/software_data/extractors_tests.rs   |  3 +-
 .../rust/ficus/tests/utils/user_data_tests.rs |  3 +-
 .../src/grpc/context_values_service.rs        |  5 ++-
 .../rust/ficus_backend/src/grpc/converters.rs | 20 +++++------
 .../src/grpc/get_context_pipeline.rs          | 10 +++---
 .../rust/ficus_backend/src/grpc/grpc_utils.rs |  4 +--
 .../src/grpc/kafka/grpc_kafka_service.rs      |  5 ++-
 .../src/grpc/kafka/kafka_service.rs           | 25 +++++++-------
 .../ficus_backend/src/grpc/kafka/models.rs    | 13 +++++---
 .../src/grpc/kafka/streaming/processors.rs    |  3 +-
 .../src/grpc/kafka/streaming/t1/configs.rs    |  2 +-
 .../src/grpc/kafka/streaming/t1/processors.rs | 18 ++++++----
 .../src/grpc/kafka/streaming/t2/configs.rs    |  2 +-
 .../kafka/streaming/t2/dfg_data_structures.rs | 33 ++++++++++---------
 .../src/grpc/pipeline_executor.rs             | 17 +++++-----
 Ficus/src/rust/ficus_backend/src/main.rs      |  2 +-
 .../bxes/src/models/domain/bxes_artifact.rs   |  6 ++--
 .../bxes/src/models/domain/bxes_driver.rs     |  6 ++--
 .../src/models/domain/bxes_log_metadata.rs    |  2 +-
 .../rust/bxes/src/models/domain/bxes_value.rs |  2 +-
 bxes/src/rust/bxes/src/models/domain/utils.rs |  3 +-
 bxes/src/rust/bxes/src/read/read_utils.rs     |  2 +-
 bxes/src/rust/bxes/src/writer/errors.rs       |  3 +-
 .../src/rust/bxes/src/writer/write_context.rs | 10 +++---
 bxes/src/rust/bxes/src/writer/writer_utils.rs |  4 +--
 .../rust/bxes/tests/test_core/random_log.rs   |  3 +-
 .../src/consumer/bxes_kafka_consumer.rs       |  3 +-
 104 files changed, 221 insertions(+), 247 deletions(-)

diff --git a/Ficus/src/rust/ficus/src/event_log/bxes/bxes_to_xes_converter.rs b/Ficus/src/rust/ficus/src/event_log/bxes/bxes_to_xes_converter.rs
index 7f85d9d57..bb3d90828 100644
--- a/Ficus/src/rust/ficus/src/event_log/bxes/bxes_to_xes_converter.rs
+++ b/Ficus/src/rust/ficus/src/event_log/bxes/bxes_to_xes_converter.rs
@@ -1,3 +1,13 @@
+use super::conversions::{bxes_value_to_payload_value, global_type_to_string};
+use crate::event_log::{
+  core::{event::event::EventPayloadValue, event_log::EventLog, trace::trace::Trace},
+  xes::{
+    shared::{XesClassifier, XesEventLogExtension, XesProperty},
+    xes_event::XesEventImpl,
+    xes_event_log::XesEventLogImpl,
+    xes_trace::XesTraceImpl,
+  },
+};
 use bxes::{
   models::{
     domain::{
@@ -13,18 +23,7 @@ use bxes::{
   },
 };
 use chrono::{TimeZone, Utc};
-use std::{cell::RefCell, collections::HashMap, fmt::Display, rc::Rc};
-use std::sync::Arc;
-use super::conversions::{bxes_value_to_payload_value, global_type_to_string};
-use crate::event_log::{
-  core::{event::event::EventPayloadValue, event_log::EventLog, trace::trace::Trace},
-  xes::{
-    shared::{XesClassifier, XesEventLogExtension, XesProperty},
-    xes_event::XesEventImpl,
-    xes_event_log::XesEventLogImpl,
-    xes_trace::XesTraceImpl,
-  },
-};
+use std::{cell::RefCell, collections::HashMap, fmt::Display, rc::Rc, sync::Arc};
 
 #[derive(Debug)]
 pub enum BxesToXesReadError {
diff --git a/Ficus/src/rust/ficus/src/event_log/bxes/conversions.rs b/Ficus/src/rust/ficus/src/event_log/bxes/conversions.rs
index 6692c7579..5dcac3ba0 100644
--- a/Ficus/src/rust/ficus/src/event_log/bxes/conversions.rs
+++ b/Ficus/src/rust/ficus/src/event_log/bxes/conversions.rs
@@ -1,4 +1,3 @@
-use std::sync::Arc;
 use bxes::{
   models::domain::{
     bxes_artifact::{BxesArtifact, BxesArtifactItem},
@@ -10,6 +9,7 @@ use bxes::{
   read::read_utils::owned_string_or_err,
 };
 use chrono::{TimeZone, Utc};
+use std::sync::Arc;
 
 use crate::event_log::core::event::{
   event::{
diff --git a/Ficus/src/rust/ficus/src/event_log/bxes/xes_to_bxes_converter.rs b/Ficus/src/rust/ficus/src/event_log/bxes/xes_to_bxes_converter.rs
index f3eecae33..aef448713 100644
--- a/Ficus/src/rust/ficus/src/event_log/bxes/xes_to_bxes_converter.rs
+++ b/Ficus/src/rust/ficus/src/event_log/bxes/xes_to_bxes_converter.rs
@@ -1,5 +1,3 @@
-use std::fmt::Display;
-use std::sync::Arc;
 use super::conversions::{parse_entity_kind, payload_value_to_bxes_value};
 use crate::event_log::{
   core::{
@@ -24,6 +22,7 @@ use bxes::{
     writer_utils::BxesLogWriteData,
   },
 };
+use std::{fmt::Display, sync::Arc};
 
 pub enum XesToBxesWriterError {
   BxesWriteError(BxesWriteError),
diff --git a/Ficus/src/rust/ficus/src/event_log/core/event/event.rs b/Ficus/src/rust/ficus/src/event_log/core/event/event.rs
index a4cb1f519..1544e3074 100644
--- a/Ficus/src/rust/ficus/src/event_log/core/event/event.rs
+++ b/Ficus/src/rust/ficus/src/event_log/core/event/event.rs
@@ -2,8 +2,7 @@ use crate::utils::user_data::user_data::UserDataOwner;
 
 use super::lifecycle::xes_lifecycle::Lifecycle;
 use chrono::{DateTime, Utc};
-use std::sync::Arc;
-use std::{collections::HashMap, fmt::Debug};
+use std::{collections::HashMap, fmt::Debug, sync::Arc};
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum EventPayloadValue {
diff --git a/Ficus/src/rust/ficus/src/event_log/core/event/event_base.rs b/Ficus/src/rust/ficus/src/event_log/core/event/event_base.rs
index 260af69da..892fb01b0 100644
--- a/Ficus/src/rust/ficus/src/event_log/core/event/event_base.rs
+++ b/Ficus/src/rust/ficus/src/event_log/core/event/event_base.rs
@@ -1,5 +1,5 @@
-use std::sync::Arc;
 use chrono::{DateTime, Utc};
+use std::sync::Arc;
 
 use crate::utils::user_data::user_data::UserDataImpl;
 
diff --git a/Ficus/src/rust/ficus/src/event_log/core/event/events_holder.rs b/Ficus/src/rust/ficus/src/event_log/core/event/events_holder.rs
index b3ab41556..5145402ca 100644
--- a/Ficus/src/rust/ficus/src/event_log/core/event/events_holder.rs
+++ b/Ficus/src/rust/ficus/src/event_log/core/event/events_holder.rs
@@ -7,8 +7,7 @@ use crate::{
 
 use super::event::Event;
 use log::debug;
-use std::{cell::RefCell, collections::HashMap, rc::Rc};
-use std::sync::Arc;
+use std::{cell::RefCell, collections::HashMap, rc::Rc, sync::Arc};
 
 #[derive(Debug)]
 pub struct EventsHolder<TEvent>
diff --git a/Ficus/src/rust/ficus/src/event_log/core/log_iterator.rs b/Ficus/src/rust/ficus/src/event_log/core/log_iterator.rs
index 3fdc2c2e6..b4e0fa06f 100644
--- a/Ficus/src/rust/ficus/src/event_log/core/log_iterator.rs
+++ b/Ficus/src/rust/ficus/src/event_log/core/log_iterator.rs
@@ -1,6 +1,5 @@
-use std::{cell::RefCell, rc::Rc};
-use std::sync::Arc;
 use super::{event_log::EventLog, trace::trace::Trace};
+use std::{cell::RefCell, rc::Rc, sync::Arc};
 
 pub struct LogIterator<TLog, TEventProcessor, TResult>
 where
diff --git a/Ficus/src/rust/ficus/src/event_log/core/trace/trace.rs b/Ficus/src/rust/ficus/src/event_log/core/trace/trace.rs
index f4b242700..b9197c17b 100644
--- a/Ficus/src/rust/ficus/src/event_log/core/trace/trace.rs
+++ b/Ficus/src/rust/ficus/src/event_log/core/trace/trace.rs
@@ -1,6 +1,5 @@
-use std::{cell::RefCell, collections::HashMap, rc::Rc};
-use std::sync::Arc;
 use crate::event_log::core::event::event::{Event, EventPayloadValue};
+use std::{cell::RefCell, collections::HashMap, rc::Rc, sync::Arc};
 
 pub trait Trace: Clone + Default {
   type TEvent: Event;
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/logs_merger.rs b/Ficus/src/rust/ficus/src/event_log/xes/logs_merger.rs
index f7c97dc1f..b934d3787 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/logs_merger.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/logs_merger.rs
@@ -3,8 +3,7 @@ use crate::event_log::{
   xes::{reader::file_xes_log_reader::read_event_log, xes_event_log::XesEventLogImpl},
 };
 use log::error;
-use std::rc::Rc;
-use std::sync::Arc;
+use std::{rc::Rc, sync::Arc};
 
 pub fn merge_xes_logs(paths: &Vec<Arc<str>>) -> XesEventLogImpl {
   let mut merged_log = XesEventLogImpl::default();
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/reader/file_xes_log_reader.rs b/Ficus/src/rust/ficus/src/event_log/xes/reader/file_xes_log_reader.rs
index 3eb5d1384..e1ce76769 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/reader/file_xes_log_reader.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/reader/file_xes_log_reader.rs
@@ -1,12 +1,12 @@
+use quick_xml::{Reader, events::BytesStart};
 use std::{
   cell::RefCell,
   collections::HashMap,
   fs::File,
   io::{BufRead, BufReader, Cursor, Read},
   rc::Rc,
+  sync::Arc,
 };
-use std::sync::Arc;
-use quick_xml::{Reader, events::BytesStart};
 
 use crate::event_log::{
   core::event::event::EventPayloadValue,
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/reader/utils.rs b/Ficus/src/rust/ficus/src/event_log/xes/reader/utils.rs
index 6fdc266df..9ef2e84b9 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/reader/utils.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/reader/utils.rs
@@ -1,6 +1,5 @@
-use std::str::FromStr;
-use std::sync::Arc;
 use chrono::{DateTime, Utc};
+use std::{str::FromStr, sync::Arc};
 
 use crate::event_log::{core::event::event::EventPayloadValue, xes::constants::*};
 
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/reader/xes_log_trace_reader.rs b/Ficus/src/rust/ficus/src/event_log/xes/reader/xes_log_trace_reader.rs
index 06f92c8d3..ec3790d88 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/reader/xes_log_trace_reader.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/reader/xes_log_trace_reader.rs
@@ -1,7 +1,6 @@
-use std::{cell::RefCell, collections::HashMap, rc::Rc};
-use std::sync::Arc;
 use chrono::{DateTime, Utc};
 use quick_xml::Reader;
+use std::{cell::RefCell, collections::HashMap, rc::Rc, sync::Arc};
 
 use crate::event_log::{
   core::event::event::EventPayloadValue,
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/shared.rs b/Ficus/src/rust/ficus/src/event_log/xes/shared.rs
index 38d5f2803..eadedcb37 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/shared.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/shared.rs
@@ -1,6 +1,5 @@
 use crate::event_log::core::event::event::EventPayloadValue;
-use std::collections::HashMap;
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};
 
 #[derive(Debug, Clone)]
 pub struct XesEventLogExtension {
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/simple.rs b/Ficus/src/rust/ficus/src/event_log/xes/simple.rs
index 5e3cc4d32..0f91c73b9 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/simple.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/simple.rs
@@ -3,8 +3,7 @@ use crate::event_log::{
   xes::{xes_event::XesEventImpl, xes_event_log::XesEventLogImpl, xes_trace::XesTraceImpl},
 };
 use chrono::Utc;
-use std::{cell::RefCell, rc::Rc};
-use std::sync::Arc;
+use std::{cell::RefCell, rc::Rc, sync::Arc};
 
 pub fn create_simple_event_log(raw_log: &Vec<Vec<&str>>) -> XesEventLogImpl {
   let mut log = XesEventLogImpl::default();
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/xes_event.rs b/Ficus/src/rust/ficus/src/event_log/xes/xes_event.rs
index 8d8ed22fe..6f9aa8d7e 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/xes_event.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/xes_event.rs
@@ -1,9 +1,3 @@
-use chrono::{DateTime, Utc};
-use std::{
-  collections::HashMap,
-  fmt::{Debug, Formatter},
-};
-use std::sync::Arc;
 use crate::{
   event_log::core::event::{
     event::{Event, EventPayloadValue},
@@ -14,6 +8,12 @@ use crate::{
     vec_utils,
   },
 };
+use chrono::{DateTime, Utc};
+use std::{
+  collections::HashMap,
+  fmt::{Debug, Formatter},
+  sync::Arc,
+};
 
 pub struct XesEventImpl {
   event_base: EventBase,
diff --git a/Ficus/src/rust/ficus/src/event_log/xes/xes_event_log.rs b/Ficus/src/rust/ficus/src/event_log/xes/xes_event_log.rs
index 98141050e..5901df184 100644
--- a/Ficus/src/rust/ficus/src/event_log/xes/xes_event_log.rs
+++ b/Ficus/src/rust/ficus/src/event_log/xes/xes_event_log.rs
@@ -16,8 +16,7 @@ use crate::{
     vec_utils,
   },
 };
-use std::{cell::RefCell, collections::HashMap, rc::Rc};
-use std::sync::Arc;
+use std::{cell::RefCell, collections::HashMap, rc::Rc, sync::Arc};
 
 #[derive(Default)]
 pub struct XesEventLogImpl {
diff --git a/Ficus/src/rust/ficus/src/features/analysis/directly_follows_graph.rs b/Ficus/src/rust/ficus/src/features/analysis/directly_follows_graph.rs
index b08fcf24f..164c7d54a 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/directly_follows_graph.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/directly_follows_graph.rs
@@ -7,8 +7,7 @@ use crate::{
   utils::graph::graph::{DefaultGraph, Graph, NodesConnectionData},
 };
 use log::warn;
-use std::{collections::HashMap, rc::Rc};
-use std::sync::Arc;
+use std::{collections::HashMap, rc::Rc, sync::Arc};
 
 pub fn construct_dfg(info: &dyn EventLogInfo) -> DefaultGraph {
   let mut graph: DefaultGraph = Default::default();
diff --git a/Ficus/src/rust/ficus/src/features/analysis/entropy/dfg_entropy.rs b/Ficus/src/rust/ficus/src/features/analysis/entropy/dfg_entropy.rs
index 9dee4957b..a3078e81d 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/entropy/dfg_entropy.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/entropy/dfg_entropy.rs
@@ -11,8 +11,8 @@ use crate::{
 use std::{
   collections::{HashMap, HashSet},
   rc::Rc,
+  sync::Arc,
 };
-use std::sync::Arc;
 
 pub fn calculate_laplace_dfg_entropy<TLog>(log: &TLog, ignored_events: Option<&HashSet<Arc<str>>>) -> HashMap<String, f64>
 where
diff --git a/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy.rs b/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy.rs
index d66ed78f3..7684bb103 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy.rs
@@ -1,9 +1,9 @@
+use super::shared::{calculate_entropies, calculate_max_vector_length, calculate_pos_entropy};
 use crate::event_log::core::{event::event::Event, event_log::EventLog, trace::trace::Trace};
 use std::{
   collections::{HashMap, HashSet},
+  sync::Arc,
 };
-use std::sync::Arc;
-use super::shared::{calculate_entropies, calculate_max_vector_length, calculate_pos_entropy};
 
 pub fn calculate_pos_entropies<TLog>(log: &TLog, ignored_events: &Option<HashSet<Arc<str>>>) -> HashMap<Arc<str>, f64>
 where
diff --git a/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy_fast.rs b/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy_fast.rs
index 367a2342a..f78ed30bc 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy_fast.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/entropy/pos_entropy_fast.rs
@@ -1,12 +1,12 @@
+use super::shared::{calculate_entropies, calculate_max_vector_length, calculate_pos_entropy};
 use crate::event_log::core::{
   event_log::EventLog,
   trace::trace::{Trace, TraceEventsPositions},
 };
 use std::{
   collections::{HashMap, HashSet},
+  sync::Arc,
 };
-use std::sync::Arc;
-use super::shared::{calculate_entropies, calculate_max_vector_length, calculate_pos_entropy};
 
 pub fn calculate_pos_entropies_fast<TLog>(log: &TLog, ignored_events: Option<&HashSet<Arc<str>>>) -> HashMap<Arc<str>, f64>
 where
diff --git a/Ficus/src/rust/ficus/src/features/analysis/entropy/shared.rs b/Ficus/src/rust/ficus/src/features/analysis/entropy/shared.rs
index cc3c37ccb..a5faa9f82 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/entropy/shared.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/entropy/shared.rs
@@ -10,8 +10,8 @@ use crate::{
 };
 use std::{
   collections::{HashMap, HashSet},
+  sync::Arc,
 };
-use std::sync::Arc;
 
 pub fn calculate_max_vector_length<TLog>(log: &TLog, ignored_events: Option<&HashSet<Arc<str>>>) -> usize
 where
diff --git a/Ficus/src/rust/ficus/src/features/analysis/log_info/dfg_info.rs b/Ficus/src/rust/ficus/src/features/analysis/log_info/dfg_info.rs
index 540829c3c..ffc7a0bc0 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/log_info/dfg_info.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/log_info/dfg_info.rs
@@ -1,7 +1,7 @@
 use std::{
   collections::{HashMap, HashSet},
+  sync::Arc,
 };
-use std::sync::Arc;
 
 pub trait DfgInfo {
   fn get_directly_follows_count(&self, first: &str, second: &str) -> usize;
diff --git a/Ficus/src/rust/ficus/src/features/analysis/log_info/event_log_info.rs b/Ficus/src/rust/ficus/src/features/analysis/log_info/event_log_info.rs
index 569b58c8e..b32415612 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/log_info/event_log_info.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/log_info/event_log_info.rs
@@ -17,8 +17,8 @@ use std::{
   collections::{HashMap, HashSet},
   ops::Deref,
   rc::Rc,
+  sync::Arc,
 };
-use std::sync::Arc;
 
 pub trait EventLogCounts {
   fn traces_count(&self) -> usize;
diff --git a/Ficus/src/rust/ficus/src/features/analysis/log_info/log_info_creation_dto.rs b/Ficus/src/rust/ficus/src/features/analysis/log_info/log_info_creation_dto.rs
index 8449aa8c2..e153f1038 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/log_info/log_info_creation_dto.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/log_info/log_info_creation_dto.rs
@@ -1,6 +1,5 @@
 use crate::event_log::core::event_log::EventLog;
-use std::collections::HashSet;
-use std::sync::Arc;
+use std::{collections::HashSet, sync::Arc};
 
 pub struct EventLogInfoCreationDto<'a, TLog>
 where
diff --git a/Ficus/src/rust/ficus/src/features/analysis/patterns/activity_instances.rs b/Ficus/src/rust/ficus/src/features/analysis/patterns/activity_instances.rs
index 9ea66d8da..47aa7b824 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/patterns/activity_instances.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/patterns/activity_instances.rs
@@ -23,8 +23,8 @@ use std::{
   ops::DerefMut,
   rc::Rc,
   str::FromStr,
+  sync::Arc,
 };
-use std::sync::Arc;
 
 #[derive(Debug, Clone, Getters, MutGetters, new)]
 pub struct ActivityInTraceInfo {
diff --git a/Ficus/src/rust/ficus/src/features/analysis/patterns/entry_points.rs b/Ficus/src/rust/ficus/src/features/analysis/patterns/entry_points.rs
index 05ac83953..0e4d9b948 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/patterns/entry_points.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/patterns/entry_points.rs
@@ -1,5 +1,3 @@
-use std::{cell::RefCell, collections::HashMap, rc::Rc};
-use std::sync::Arc;
 use super::{
   activity_instances::{self, ActivityInTraceInfo, create_new_log_from_activities_instances, extract_activities_instances},
   contexts::{ActivitiesDiscoveryContext, ActivitiesInstancesDiscoveryContext, PatternsDiscoveryContext},
@@ -17,6 +15,7 @@ use crate::{
     pattern_info::UnderlyingPatternKind,
   },
 };
+use std::{cell::RefCell, collections::HashMap, rc::Rc, sync::Arc};
 
 #[derive(Clone, Copy)]
 pub enum PatternsKind {
diff --git a/Ficus/src/rust/ficus/src/features/analysis/patterns/repeat_sets.rs b/Ficus/src/rust/ficus/src/features/analysis/patterns/repeat_sets.rs
index ca5dabd13..01f5351c9 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/patterns/repeat_sets.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/patterns/repeat_sets.rs
@@ -1,13 +1,15 @@
+use super::tandem_arrays::SubArrayInTraceInfo;
 use crate::{features::analysis::patterns::pattern_info::UnderlyingPatternKind, utils::hash_utils::calculate_poly_hash_for_collection};
 use getset::Getters;
 use std::{
   cell::RefCell,
   collections::{HashMap, HashSet},
   rc::Rc,
-  sync::atomic::{AtomicU64, Ordering},
+  sync::{
+    Arc,
+    atomic::{AtomicU64, Ordering},
+  },
 };
-use std::sync::Arc;
-use super::tandem_arrays::SubArrayInTraceInfo;
 
 #[derive(Clone, Copy, Debug)]
 pub struct SubArrayWithTraceIndex {
diff --git a/Ficus/src/rust/ficus/src/features/analysis/patterns/strict_loops.rs b/Ficus/src/rust/ficus/src/features/analysis/patterns/strict_loops.rs
index 211156bac..1e2eb9519 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/patterns/strict_loops.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/patterns/strict_loops.rs
@@ -11,8 +11,7 @@ use crate::{
   },
   utils::display_name::get_display_name,
 };
-use std::{cell::RefCell, collections::HashSet, rc::Rc};
-use std::sync::Arc;
+use std::{cell::RefCell, collections::HashSet, rc::Rc, sync::Arc};
 
 pub fn find_loops_strict(log: &XesEventLogImpl, hashed_log: &Vec<Vec<u64>>, max_array_length: usize) -> Vec<Vec<ActivityInTraceInfo>> {
   find_tandem_arrays_strict(hashed_log, max_array_length)
diff --git a/Ficus/src/rust/ficus/src/features/clustering/activities/activities_common.rs b/Ficus/src/rust/ficus/src/features/clustering/activities/activities_common.rs
index b10767b58..7b847639a 100644
--- a/Ficus/src/rust/ficus/src/features/clustering/activities/activities_common.rs
+++ b/Ficus/src/rust/ficus/src/features/clustering/activities/activities_common.rs
@@ -1,12 +1,12 @@
+use linfa::DatasetBase;
+use ndarray::Array2;
 use std::{
   cell::RefCell,
   collections::{HashMap, HashSet},
   rc::Rc,
+  sync::Arc,
   vec,
 };
-use std::sync::Arc;
-use linfa::DatasetBase;
-use ndarray::Array2;
 
 use super::activities_params::{ActivitiesVisualizationParams, ActivityRepresentationSource};
 use crate::{
diff --git a/Ficus/src/rust/ficus/src/features/clustering/activities/merging.rs b/Ficus/src/rust/ficus/src/features/clustering/activities/merging.rs
index 40c799394..7d66656d7 100644
--- a/Ficus/src/rust/ficus/src/features/clustering/activities/merging.rs
+++ b/Ficus/src/rust/ficus/src/features/clustering/activities/merging.rs
@@ -1,10 +1,10 @@
+use ndarray::Array1;
 use std::{
   cell::RefCell,
   collections::{HashMap, HashSet},
   rc::Rc,
+  sync::Arc,
 };
-use std::sync::Arc;
-use ndarray::Array1;
 
 use crate::{
   event_log::core::{event::event::Event, event_log::EventLog, trace::trace::Trace},
diff --git a/Ficus/src/rust/ficus/src/features/clustering/common.rs b/Ficus/src/rust/ficus/src/features/clustering/common.rs
index 2fa37b808..f7a721980 100644
--- a/Ficus/src/rust/ficus/src/features/clustering/common.rs
+++ b/Ficus/src/rust/ficus/src/features/clustering/common.rs
@@ -1,6 +1,3 @@
-use linfa::Dataset;
-use ndarray::{Array1, Ix1};
-use std::sync::Arc;
 use crate::{
   event_log::xes::xes_event_log::XesEventLogImpl,
   utils::{
@@ -8,6 +5,9 @@ use crate::{
     dataset::dataset::FicusDataset,
   },
 };
+use linfa::Dataset;
+use ndarray::{Array1, Ix1};
+use std::sync::Arc;
 
 pub(super) type MyDataset = Dataset<f64, (), Ix1>;
 pub(super) type ClusteredDataset = Dataset<f64, usize, Ix1>;
diff --git a/Ficus/src/rust/ficus/src/features/clustering/traces/common.rs b/Ficus/src/rust/ficus/src/features/clustering/traces/common.rs
index d7821c75a..bcddb3d99 100644
--- a/Ficus/src/rust/ficus/src/features/clustering/traces/common.rs
+++ b/Ficus/src/rust/ficus/src/features/clustering/traces/common.rs
@@ -34,8 +34,8 @@ use std::{
   cell::RefCell,
   collections::{HashMap, HashSet},
   rc::Rc,
+  sync::Arc,
 };
-use std::sync::Arc;
 
 pub fn do_clusterize_log_by_traces(
   params: &mut TracesClusteringParams,
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha.rs
index 84b9f5961..dbd9dba5f 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha.rs
@@ -23,8 +23,8 @@ use lazy_static::lazy_static;
 use std::{
   collections::{HashMap, HashSet},
   string::ToString,
+  sync::Arc,
 };
-use std::sync::Arc;
 
 const ALPHA_SET: &str = "alpha_set";
 context_key! { ALPHA_SET, AlphaSet }
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc.rs
index 1acf41ef9..b44a1d193 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc.rs
@@ -20,8 +20,8 @@ use crate::{
 };
 use std::{
   collections::{HashMap, HashSet, VecDeque},
+  sync::Arc,
 };
-use std::sync::Arc;
 
 pub fn discover_petri_net_alpha_plus_plus_nfc<TLog: EventLog>(log: &TLog) -> DefaultPetriNet {
   let one_length_loop_transitions = find_transitions_one_length_loop(log);
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc_triple.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc_triple.rs
index 50329e24d..2757c21c5 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc_triple.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/alpha_plus_plus_nfc_triple.rs
@@ -6,12 +6,12 @@ use crate::{
   },
   utils::{hash_utils::compare_based_on_hashes, sets::two_sets::TwoSets},
 };
+use std::sync::Arc;
 pub use std::{
   collections::BTreeSet,
   fmt::Display,
   hash::{Hash, Hasher},
 };
-use std::sync::Arc;
 
 pub(crate) struct AlphaPlusPlusNfcTriple {
   a_classes: BTreeSet<Arc<str>>,
@@ -42,8 +42,9 @@ impl AlphaPlusPlusNfcTriple {
   }
 
   pub fn try_merge<TLog: EventLog>(first: &Self, second: &Self, provider: &AlphaPlusNfcRelationsProvider<'_, TLog>) -> Option<Self> {
-    let merge_sets =
-      |first: &BTreeSet<Arc<str>>, second: &BTreeSet<Arc<str>>| -> BTreeSet<Arc<str>> { first.iter().chain(second.iter()).cloned().collect() };
+    let merge_sets = |first: &BTreeSet<Arc<str>>, second: &BTreeSet<Arc<str>>| -> BTreeSet<Arc<str>> {
+      first.iter().chain(second.iter()).cloned().collect()
+    };
 
     let new_triple = Self {
       a_classes: merge_sets(&first.a_classes, &second.a_classes),
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/extended_alpha_set.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/extended_alpha_set.rs
index 35249b94c..179bc345a 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/extended_alpha_set.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/extended_alpha_set.rs
@@ -10,8 +10,8 @@ use std::{
   collections::{BTreeSet, HashSet},
   fmt::Display,
   hash::{Hash, Hasher},
+  sync::Arc,
 };
-use std::sync::Arc;
 
 pub(crate) struct ExtendedAlphaSet {
   alpha_set: AlphaSet,
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/w3_pair.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/w3_pair.rs
index f36511d3f..e303ad9b6 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/w3_pair.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_plus_plus_nfc/w3_pair.rs
@@ -7,8 +7,8 @@ use std::{
   collections::HashSet,
   fmt::Display,
   hash::{Hash, Hasher},
+  sync::Arc,
 };
-use std::sync::Arc;
 
 pub(crate) struct W3Pair {
   two_sets: TwoSets<Arc<str>>,
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_set.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_set.rs
index fffecab20..a49bcfc55 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_set.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/alpha_set.rs
@@ -5,8 +5,8 @@ use crate::{
 use std::{
   fmt::Display,
   hash::{Hash, Hasher},
+  sync::Arc,
 };
-use std::sync::Arc;
 
 #[derive(Debug, Default)]
 pub struct AlphaSet {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_nfc_provider.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_nfc_provider.rs
index 6db681547..8c9c48420 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_nfc_provider.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_nfc_provider.rs
@@ -13,8 +13,7 @@ use crate::{
     },
   },
 };
-use std::collections::HashSet;
-use std::sync::Arc;
+use std::{collections::HashSet, sync::Arc};
 
 enum PrePostSet {
   PreSet,
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_provider.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_provider.rs
index 92f4a60a5..6fcdbb916 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_provider.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_plus_provider.rs
@@ -2,8 +2,7 @@ use crate::features::{
   analysis::log_info::event_log_info::EventLogInfo,
   discovery::{alpha::providers::alpha_provider::AlphaRelationsProvider, relations::triangle_relation::TriangleRelation},
 };
-use std::collections::HashSet;
-use std::sync::Arc;
+use std::{collections::HashSet, sync::Arc};
 
 pub trait AlphaPlusRelationsProvider: AlphaRelationsProvider {
   fn triangle_relation(&self, first: &str, second: &str) -> bool;
diff --git a/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_sharp_provider.rs b/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_sharp_provider.rs
index 5b66dee14..7644091cf 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_sharp_provider.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/alpha/providers/alpha_sharp_provider.rs
@@ -8,8 +8,7 @@ use crate::features::{
     relations::triangle_relation::TriangleRelation,
   },
 };
-use std::collections::HashSet;
-use std::sync::Arc;
+use std::{collections::HashSet, sync::Arc};
 
 pub struct AlphaSharpRelationsProvider<'a> {
   alpha_plus_provider: AlphaPlusRelationsProviderImpl<'a>,
diff --git a/Ficus/src/rust/ficus/src/features/discovery/ecfg/adjustments.rs b/Ficus/src/rust/ficus/src/features/discovery/ecfg/adjustments.rs
index b7af338a9..2e7df2c36 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/ecfg/adjustments.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/ecfg/adjustments.rs
@@ -20,8 +20,8 @@ use crate::{
 use std::{
   collections::{HashMap, HashSet},
   fmt::Debug,
+  sync::Arc,
 };
-use std::sync::Arc;
 
 pub fn merge_sequences_of_nodes(graph: &mut DefaultGraph, performance_map: Option<PerformanceMap>) {
   for current_sequence in discover_sequences_to_merge(graph) {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery.rs b/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery.rs
index 99b184688..85c2979aa 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery.rs
@@ -23,8 +23,8 @@ use lazy_static::lazy_static;
 use std::{
   collections::{HashMap, VecDeque},
   fmt::Debug,
+  sync::Arc,
 };
-use std::sync::Arc;
 
 const EVENT_UNIQUE_ID: &str = "EVENT_UNIQUE_ID";
 context_key! { EVENT_UNIQUE_ID, Vec<u64> }
diff --git a/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery_xes.rs b/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery_xes.rs
index 9e8f8411d..ab771c812 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery_xes.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/ecfg/discovery_xes.rs
@@ -32,8 +32,7 @@ use crate::{
     user_data::user_data::{UserData, UserDataImpl, UserDataOwner},
   },
 };
-use std::{cell::RefCell, fmt::Debug, ops::Deref, rc::Rc};
-use std::sync::Arc;
+use std::{cell::RefCell, fmt::Debug, ops::Deref, rc::Rc, sync::Arc};
 
 pub fn discover_ecfg_from_event_log(
   log: &XesEventLogImpl,
diff --git a/Ficus/src/rust/ficus/src/features/discovery/ecfg/log_prepare.rs b/Ficus/src/rust/ficus/src/features/discovery/ecfg/log_prepare.rs
index d579f54c6..9a4f01dce 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/ecfg/log_prepare.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/ecfg/log_prepare.rs
@@ -8,8 +8,7 @@ use crate::{
   },
   pipelines::errors::pipeline_errors::PipelinePartExecutionError,
 };
-use std::{cell::RefCell, collections::HashMap, rc::Rc};
-use std::sync::Arc;
+use std::{cell::RefCell, collections::HashMap, rc::Rc, sync::Arc};
 
 pub fn prepare_software_log(
   log: &XesEventLogImpl,
diff --git a/Ficus/src/rust/ficus/src/features/discovery/fuzzy/fuzzy_miner.rs b/Ficus/src/rust/ficus/src/features/discovery/fuzzy/fuzzy_miner.rs
index 9d210ea90..c8f563142 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/fuzzy/fuzzy_miner.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/fuzzy/fuzzy_miner.rs
@@ -11,8 +11,8 @@ use std::{
   cell::RefCell,
   collections::{HashMap, HashSet},
   rc::Rc,
+  sync::Arc,
 };
-use std::sync::Arc;
 
 pub type FuzzyGraph = Graph<Arc<str>, f64>;
 
diff --git a/Ficus/src/rust/ficus/src/features/discovery/heuristic/heuristic_miner.rs b/Ficus/src/rust/ficus/src/features/discovery/heuristic/heuristic_miner.rs
index f55013400..86bd4844f 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/heuristic/heuristic_miner.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/heuristic/heuristic_miner.rs
@@ -13,8 +13,8 @@ use crate::{
 use std::{
   collections::{HashMap, HashSet},
   rc::Rc,
+  sync::Arc,
 };
-use std::sync::Arc;
 
 pub fn discover_petri_net_heuristic(
   info: &dyn EventLogInfo,
diff --git a/Ficus/src/rust/ficus/src/features/discovery/heuristic/relations_provider.rs b/Ficus/src/rust/ficus/src/features/discovery/heuristic/relations_provider.rs
index 8773330c8..90436a868 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/heuristic/relations_provider.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/heuristic/relations_provider.rs
@@ -5,8 +5,7 @@ use crate::features::{
     relations::triangle_relation::TriangleRelation,
   },
 };
-use std::collections::HashMap;
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};
 
 type DependencyRelations = HashMap<Arc<str>, HashMap<Arc<str>, f64>>;
 
diff --git a/Ficus/src/rust/ficus/src/features/discovery/multithreaded_dfg/dfg.rs b/Ficus/src/rust/ficus/src/features/discovery/multithreaded_dfg/dfg.rs
index 69a1d179d..70f9e550b 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/multithreaded_dfg/dfg.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/multithreaded_dfg/dfg.rs
@@ -18,8 +18,8 @@ use std::{
   cell::RefCell,
   collections::{HashMap, HashSet},
   rc::Rc,
+  sync::Arc,
 };
-use std::sync::Arc;
 
 const MULTITHREADED_FRAGMENT: &str = "MULTITHREADED_FRAGMENT";
 
diff --git a/Ficus/src/rust/ficus/src/features/discovery/ocel/graph_annotation.rs b/Ficus/src/rust/ficus/src/features/discovery/ocel/graph_annotation.rs
index 89a75ce24..06e1a7a73 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/ocel/graph_annotation.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/ocel/graph_annotation.rs
@@ -8,8 +8,8 @@ use getset::Getters;
 use lazy_static::lazy_static;
 use std::{
   collections::{HashMap, HashSet, VecDeque},
+  sync::Arc,
 };
-use std::sync::Arc;
 
 #[derive(new, Getters)]
 pub struct OcelAnnotation {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/petri_net/annotations.rs b/Ficus/src/rust/ficus/src/features/discovery/petri_net/annotations.rs
index 48d1d51a8..1a14eec46 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/petri_net/annotations.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/petri_net/annotations.rs
@@ -9,8 +9,7 @@ use crate::{
 };
 use lazy_static::lazy_static;
 use log::error;
-use std::{collections::HashMap, rc::Rc, str::FromStr};
-use std::sync::Arc;
+use std::{collections::HashMap, rc::Rc, str::FromStr, sync::Arc};
 
 pub fn annotate_with_counts(
   log: &impl EventLog,
diff --git a/Ficus/src/rust/ficus/src/features/discovery/petri_net/petri_net.rs b/Ficus/src/rust/ficus/src/features/discovery/petri_net/petri_net.rs
index 0070c3c29..af5e1eb8b 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/petri_net/petri_net.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/petri_net/petri_net.rs
@@ -1,7 +1,6 @@
 use super::arc::PetriNetArc;
 use crate::features::discovery::petri_net::{marking::Marking, place::Place, transition::Transition};
-use std::collections::HashMap;
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};
 
 pub type DefaultPetriNet = PetriNet<Arc<str>, ()>;
 
diff --git a/Ficus/src/rust/ficus/src/features/discovery/petri_net/replay.rs b/Ficus/src/rust/ficus/src/features/discovery/petri_net/replay.rs
index 49d6984c7..9a290b1a7 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/petri_net/replay.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/petri_net/replay.rs
@@ -1,9 +1,9 @@
+use super::{marking::Marking, petri_net::DefaultPetriNet, transition::Transition};
 use crate::event_log::core::{event::event::Event, event_log::EventLog, trace::trace::Trace};
 use std::{
   collections::{HashMap, VecDeque},
+  sync::Arc,
 };
-use std::sync::Arc;
-use super::{marking::Marking, petri_net::DefaultPetriNet, transition::Transition};
 
 #[derive(Debug)]
 pub struct ReplayState {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/petri_net/transition.rs b/Ficus/src/rust/ficus/src/features/discovery/petri_net/transition.rs
index f4f499ced..16a7d5afa 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/petri_net/transition.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/petri_net/transition.rs
@@ -1,8 +1,8 @@
 use crate::features::discovery::petri_net::{arc::PetriNetArc, ids::next_id};
 use std::{
   hash::{Hash, Hasher},
+  sync::Arc,
 };
-use std::sync::Arc;
 
 #[derive(Debug)]
 pub struct Transition<TTransitionData, TArcData>
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/abstraction.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/abstraction.rs
index bdcebf92e..0d713f83c 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/abstraction.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/abstraction.rs
@@ -37,8 +37,7 @@ use crate::{
   },
 };
 use log::error;
-use std::{cell::RefCell, rc::Rc};
-use std::sync::Arc;
+use std::{cell::RefCell, rc::Rc, sync::Arc};
 
 pub fn abstract_event_groups(
   event_groups: Vec<Vec<EventGroup>>,
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/discovery.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/discovery.rs
index 7832e182e..6284d0a5b 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/discovery.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/discovery.rs
@@ -19,8 +19,8 @@ use std::{
   fmt::{Debug, Display, Formatter},
   ops::Deref,
   rc::Rc,
+  sync::Arc,
 };
-use std::sync::Arc;
 
 #[derive(Debug, Clone, Getters, new)]
 pub struct LogTimelineDiagram {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extraction_config.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extraction_config.rs
index 99402d9d9..b3f7fce38 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extraction_config.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extraction_config.rs
@@ -3,8 +3,7 @@ use derive_new::new;
 use fancy_regex::Regex;
 use getset::{Getters, Setters};
 use serde::{Deserialize, Serialize};
-use std::fmt::Debug;
-use std::sync::Arc;
+use std::{fmt::Debug, sync::Arc};
 
 #[derive(Clone, Debug, Setters, Getters, Serialize, Deserialize, Default)]
 pub struct SoftwareDataExtractionConfig {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/activities_durations.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/activities_durations.rs
index 8f7c9296e..0dd858240 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/activities_durations.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/activities_durations.rs
@@ -18,8 +18,7 @@ use derive_new::new;
 use fancy_regex::Regex;
 use getset::Getters;
 use log::error;
-use std::{cell::RefCell, collections::HashMap, rc::Rc};
-use std::sync::Arc;
+use std::{cell::RefCell, collections::HashMap, rc::Rc, sync::Arc};
 
 #[derive(Clone, Debug, new)]
 pub struct ActivityDurationExtractor<'a> {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/core.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/core.rs
index 8bd682e09..927db07ec 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/core.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/core.rs
@@ -8,8 +8,8 @@ use std::{
   fmt::{Debug, Display, Formatter},
   rc::Rc,
   str::FromStr,
+  sync::Arc,
 };
-use std::sync::Arc;
 
 #[derive(Debug, Clone)]
 pub enum SoftwareDataExtractionError {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/ocel.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/ocel.rs
index f4e0386cb..72d3a305b 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/ocel.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/ocel.rs
@@ -15,8 +15,7 @@ use crate::{
 use derive_new::new;
 use fancy_regex::Regex;
 use log::{debug, warn};
-use std::{cell::RefCell, collections::HashMap, fmt::Debug, rc::Rc};
-use std::sync::Arc;
+use std::{cell::RefCell, collections::HashMap, fmt::Debug, rc::Rc, sync::Arc};
 
 #[derive(Debug, Clone, new)]
 pub struct OcelDataExtractor<'a> {
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/utils.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/utils.rs
index 6edc71e43..649a795b1 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/utils.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/extractors/utils.rs
@@ -6,8 +6,7 @@ use crate::{
   features::discovery::timeline::software_data::{extraction_config::NameCreationStrategy, extractors::core::SoftwareDataExtractionError},
 };
 use fancy_regex::Regex;
-use std::collections::HashMap;
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};
 
 pub type RegexParingResult = Result<Regex, SoftwareDataExtractionError>;
 
diff --git a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/models.rs b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/models.rs
index 8fc1d8233..5583ecb93 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/models.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/timeline/software_data/models.rs
@@ -3,8 +3,7 @@ use derive_new::new;
 use enum_display::EnumDisplay;
 use getset::{Getters, MutGetters};
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
-use std::sync::Arc;
+use std::{collections::HashMap, sync::Arc};
 
 #[derive(Clone, Debug, Getters, MutGetters, Serialize, Deserialize, Default)]
 pub struct SoftwareData {
diff --git a/Ficus/src/rust/ficus/src/features/mutations/mutations.rs b/Ficus/src/rust/ficus/src/features/mutations/mutations.rs
index 1ff6964e6..83ce2c04e 100644
--- a/Ficus/src/rust/ficus/src/features/mutations/mutations.rs
+++ b/Ficus/src/rust/ficus/src/features/mutations/mutations.rs
@@ -1,6 +1,5 @@
 use crate::event_log::core::{event::event::Event, event_log::EventLog, trace::trace::Trace};
-use std::{cell::RefCell, rc::Rc};
-use std::sync::Arc;
+use std::{cell::RefCell, rc::Rc, sync::Arc};
 
 pub fn rename_events<TLog, TFilter>(log: &mut TLog, new_name: Arc<str>, filter: TFilter)
 where
diff --git a/Ficus/src/rust/ficus/src/features/streaming/counters/sliding_window.rs b/Ficus/src/rust/ficus/src/features/streaming/counters/sliding_window.rs
index c553a7bb6..e8cbd66b0 100644
--- a/Ficus/src/rust/ficus/src/features/streaming/counters/sliding_window.rs
+++ b/Ficus/src/rust/ficus/src/features/streaming/counters/sliding_window.rs
@@ -1,7 +1,6 @@
 use crate::features::streaming::counters::core::{StreamingCounter, StreamingCounterEntry, ValueUpdateKind};
 use chrono::{DateTime, Utc};
-use std::{collections::HashMap, hash::Hash, ops::Add, rc::Rc, time::Duration};
-use std::sync::Arc;
+use std::{collections::HashMap, hash::Hash, ops::Add, rc::Rc, sync::Arc, time::Duration};
 
 #[derive(Clone)]
 struct SlidingWindowEntry<TValue: Clone> {
diff --git a/Ficus/src/rust/ficus/src/pipelines/activities_parts.rs b/Ficus/src/rust/ficus/src/pipelines/activities_parts.rs
index aed0d4d0d..7dfdb0728 100644
--- a/Ficus/src/rust/ficus/src/pipelines/activities_parts.rs
+++ b/Ficus/src/rust/ficus/src/pipelines/activities_parts.rs
@@ -42,8 +42,7 @@ use crate::{
   },
 };
 use chrono::TimeDelta;
-use std::{cell::RefCell, collections::HashMap, path::Path, rc::Rc, str::FromStr};
-use std::sync::Arc;
+use std::{cell::RefCell, collections::HashMap, path::Path, rc::Rc, str::FromStr, sync::Arc};
 
 pub enum UndefActivityHandlingStrategyDto {
   DontInsert,
diff --git a/Ficus/src/rust/ficus/src/pipelines/drawing_parts.rs b/Ficus/src/rust/ficus/src/pipelines/drawing_parts.rs
index 614c82190..81121aa34 100644
--- a/Ficus/src/rust/ficus/src/pipelines/drawing_parts.rs
+++ b/Ficus/src/rust/ficus/src/pipelines/drawing_parts.rs
@@ -18,8 +18,7 @@ use crate::{
   },
 };
 use fancy_regex::Regex;
-use std::{collections::HashMap, rc::Rc};
-use std::sync::Arc;
+use std::{collections::HashMap, rc::Rc, sync::Arc};
 
 impl PipelineParts {
   pipeline_part!(traces_diversity_diagram, |context: &mut PipelineContext, _, _| {
diff --git a/Ficus/src/rust/ficus/src/pipelines/keys/context_keys.rs b/Ficus/src/rust/ficus/src/pipelines/keys/context_keys.rs
index 5aa78910c..2863070fa 100644
--- a/Ficus/src/rust/ficus/src/pipelines/keys/context_keys.rs
+++ b/Ficus/src/rust/ficus/src/pipelines/keys/context_keys.rs
@@ -36,8 +36,7 @@ use crate::{
 };
 use bxes::models::system_models::SystemMetadata;
 use lazy_static::lazy_static;
-use std::{cell::RefCell, collections::HashMap, ops::Deref, rc::Rc};
-use std::sync::Arc;
+use std::{cell::RefCell, collections::HashMap, ops::Deref, rc::Rc, sync::Arc};
 use uuid::Uuid;
 
 pub const CASE_NAME: &str = "case_name";
diff --git a/Ficus/src/rust/ficus/src/pipelines/multithreading.rs b/Ficus/src/rust/ficus/src/pipelines/multithreading.rs
index 6b67ac46a..00b2bb2ac 100644
--- a/Ficus/src/rust/ficus/src/pipelines/multithreading.rs
+++ b/Ficus/src/rust/ficus/src/pipelines/multithreading.rs
@@ -41,8 +41,7 @@ use crate::{
   },
 };
 use fancy_regex::Regex;
-use std::{cell::RefCell, collections::HashMap, rc::Rc, str::FromStr};
-use std::sync::Arc;
+use std::{cell::RefCell, collections::HashMap, rc::Rc, str::FromStr, sync::Arc};
 
 #[derive(Copy, Clone)]
 pub enum FeatureCountKindDto {
diff --git a/Ficus/src/rust/ficus/src/utils/colors.rs b/Ficus/src/rust/ficus/src/utils/colors.rs
index baa71fd44..add2d0bbd 100644
--- a/Ficus/src/rust/ficus/src/utils/colors.rs
+++ b/Ficus/src/rust/ficus/src/utils/colors.rs
@@ -1,8 +1,8 @@
 use rand::Rng;
 use std::{
   collections::{HashMap, HashSet},
+  sync::Arc,
 };
-use std::sync::Arc;
 
 #[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)]
 pub struct Color {
diff --git a/Ficus/src/rust/ficus/src/utils/graph/graph.rs b/Ficus/src/rust/ficus/src/utils/graph/graph.rs
index ebd2a6ccf..705326fe6 100644
--- a/Ficus/src/rust/ficus/src/utils/graph/graph.rs
+++ b/Ficus/src/rust/ficus/src/utils/graph/graph.rs
@@ -3,8 +3,11 @@ use crate::utils::{
   user_data::user_data::UserDataImpl,
 };
 use getset::{Getters, Setters};
-use std::{collections::HashMap, fmt::Display, sync::atomic::AtomicU64};
-use std::sync::Arc;
+use std::{
+  collections::HashMap,
+  fmt::Display,
+  sync::{Arc, atomic::AtomicU64},
+};
 
 pub(crate) static NEXT_ID: AtomicU64 = AtomicU64::new(0);
 pub type DefaultGraph = Graph<Arc<str>, Arc<str>>;
diff --git a/Ficus/src/rust/ficus/src/utils/graph/graph_conversions.rs b/Ficus/src/rust/ficus/src/utils/graph/graph_conversions.rs
index 97cccd3b3..15be27d9c 100644
--- a/Ficus/src/rust/ficus/src/utils/graph/graph_conversions.rs
+++ b/Ficus/src/rust/ficus/src/utils/graph/graph_conversions.rs
@@ -3,8 +3,7 @@ use crate::utils::graph::{
   graph_edge::GraphEdge,
   graph_node::GraphNode,
 };
-use std::{collections::HashMap, fmt::Display};
-use std::sync::Arc;
+use std::{collections::HashMap, fmt::Display, sync::Arc};
 
 impl<TNodeData, TEdgeData> Graph<TNodeData, TEdgeData>
 where
diff --git a/Ficus/src/rust/ficus/src/utils/references.rs b/Ficus/src/rust/ficus/src/utils/references.rs
index 8ce237e4e..7d7a4bf49 100644
--- a/Ficus/src/rust/ficus/src/utils/references.rs
+++ b/Ficus/src/rust/ficus/src/utils/references.rs
@@ -4,8 +4,8 @@ use std::{
   hash::{Hash, Hasher},
   ops::Deref,
   rc::Rc,
+  sync::Arc,
 };
-use std::sync::Arc;
 
 pub enum ReferenceOrOwned<'a, T> {
   Ref(&'a T),
diff --git a/Ficus/src/rust/ficus/tests/analysis/analysis_tests.rs b/Ficus/src/rust/ficus/tests/analysis/analysis_tests.rs
index 3fb1fb788..9daeee65b 100644
--- a/Ficus/src/rust/ficus/tests/analysis/analysis_tests.rs
+++ b/Ficus/src/rust/ficus/tests/analysis/analysis_tests.rs
@@ -14,8 +14,8 @@ use ficus::features::analysis::{
 };
 use std::{
   collections::{HashMap, HashSet},
+  sync::Arc,
 };
-use std::sync::Arc;
 
 #[test]
 fn test_dfg_info() {
diff --git a/Ficus/src/rust/ficus/tests/analysis/patterns/activities_instances_tests.rs b/Ficus/src/rust/ficus/tests/analysis/patterns/activities_instances_tests.rs
index 8bba0f60a..8894d83fa 100644
--- a/Ficus/src/rust/ficus/tests/analysis/patterns/activities_instances_tests.rs
+++ b/Ficus/src/rust/ficus/tests/analysis/patterns/activities_instances_tests.rs
@@ -17,8 +17,7 @@ use ficus::{
   },
   vecs,
 };
-use std::{cell::RefCell, ops::Deref, rc::Rc};
-use std::sync::Arc;
+use std::{cell::RefCell, ops::Deref, rc::Rc, sync::Arc};
 
 #[test]
 fn test_activity_instances() {
diff --git a/Ficus/src/rust/ficus/tests/discovery/multithreaded_dfg_tests.rs b/Ficus/src/rust/ficus/tests/discovery/multithreaded_dfg_tests.rs
index dd63c1473..dde0f9303 100644
--- a/Ficus/src/rust/ficus/tests/discovery/multithreaded_dfg_tests.rs
+++ b/Ficus/src/rust/ficus/tests/discovery/multithreaded_dfg_tests.rs
@@ -9,8 +9,7 @@ use ficus::{
   },
   features::discovery::multithreaded_dfg::dfg::{MultithreadedTracePartsCreationStrategy, discover_multithreaded_dfg},
 };
-use std::{cell::RefCell, rc::Rc};
-use std::sync::Arc;
+use std::{cell::RefCell, rc::Rc, sync::Arc};
 
 const TEST_THREAD_ID_ATTRIBUTE: &'static str = "TestThreadId";
 
diff --git a/Ficus/src/rust/ficus/tests/mutations/mutations_tests.rs b/Ficus/src/rust/ficus/tests/mutations/mutations_tests.rs
index b68f1b8a2..f5250953f 100644
--- a/Ficus/src/rust/ficus/tests/mutations/mutations_tests.rs
+++ b/Ficus/src/rust/ficus/tests/mutations/mutations_tests.rs
@@ -12,8 +12,7 @@ use ficus::{
     mutations::{ARTIFICIAL_END_EVENT_NAME, ARTIFICIAL_START_EVENT_NAME, add_artificial_start_end_activities, rename_events},
   },
 };
-use std::{cell::RefCell, collections::HashSet, rc::Rc, vec};
-use std::sync::Arc;
+use std::{cell::RefCell, collections::HashSet, rc::Rc, sync::Arc, vec};
 
 #[test]
 fn test_removing_events() {
diff --git a/Ficus/src/rust/ficus/tests/other/test_simple_event_log.rs b/Ficus/src/rust/ficus/tests/other/test_simple_event_log.rs
index bbd7b9115..de4e28674 100644
--- a/Ficus/src/rust/ficus/tests/other/test_simple_event_log.rs
+++ b/Ficus/src/rust/ficus/tests/other/test_simple_event_log.rs
@@ -5,8 +5,7 @@ use ficus::event_log::{
   core::{event::event::Event, event_log::EventLog, trace::trace::Trace},
   xes::{xes_event::XesEventImpl, xes_event_log::XesEventLogImpl},
 };
-use std::rc::Rc;
-use std::sync::Arc;
+use std::{rc::Rc, sync::Arc};
 
 #[test]
 fn test_simple_event_log_creation() {
diff --git a/Ficus/src/rust/ficus/tests/software_data/extractors_tests.rs b/Ficus/src/rust/ficus/tests/software_data/extractors_tests.rs
index f1f628d0d..d9ad3d5a7 100644
--- a/Ficus/src/rust/ficus/tests/software_data/extractors_tests.rs
+++ b/Ficus/src/rust/ficus/tests/software_data/extractors_tests.rs
@@ -21,8 +21,7 @@ use ficus::{
     },
   },
 };
-use std::{cell::RefCell, rc::Rc};
-use std::sync::Arc;
+use std::{cell::RefCell, rc::Rc, sync::Arc};
 
 #[test]
 fn test_general_histogram() {
diff --git a/Ficus/src/rust/ficus/tests/utils/user_data_tests.rs b/Ficus/src/rust/ficus/tests/utils/user_data_tests.rs
index a3cfc72bd..6db102342 100644
--- a/Ficus/src/rust/ficus/tests/utils/user_data_tests.rs
+++ b/Ficus/src/rust/ficus/tests/utils/user_data_tests.rs
@@ -1,9 +1,8 @@
-use std::rc::Rc;
-use std::sync::Arc;
 use ficus::utils::user_data::{
   keys::DefaultKey,
   user_data::{UserData, UserDataImpl},
 };
+use std::{rc::Rc, sync::Arc};
 
 #[test]
 fn test_user_data() {
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/context_values_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/context_values_service.rs
index 4588cfcaa..e7ac77a25 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/context_values_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/context_values_service.rs
@@ -1,8 +1,7 @@
-use crate::ficus_proto::{GrpcGetAllContextValuesResult, GrpcGetContextValueRequest};
 use crate::{
   ficus_proto::{
-    GrpcContextKey, GrpcContextKeyValue, GrpcContextValuePart, GrpcDropContextValuesRequest, GrpcGuid,
-    grpc_context_values_service_server::GrpcContextValuesService,
+    GrpcContextKey, GrpcContextKeyValue, GrpcContextValuePart, GrpcDropContextValuesRequest, GrpcGetAllContextValuesResult,
+    GrpcGetContextValueRequest, GrpcGuid, grpc_context_values_service_server::GrpcContextValuesService,
   },
   grpc::converters::context_value_from_bytes,
 };
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/converters.rs b/Ficus/src/rust/ficus_backend/src/grpc/converters.rs
index 2f56dd173..fa66e462e 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/converters.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/converters.rs
@@ -1,12 +1,8 @@
 use crate::ficus_proto::{
-  grpc_annotation::Annotation::{CountAnnotation, FrequencyAnnotation, TimeAnnotation},
-  grpc_context_value::{ContextValue, ContextValue::Annotation},
-  grpc_event_attribute, grpc_graph_edge_additional_data,
-  grpc_node_additional_data::Data,
-  grpc_ocel_data, GrpcActivityDurationData, GrpcActivityStartEndData, GrpcAnnotation, GrpcBytes, GrpcColor, GrpcColoredRectangle,
-  GrpcColorsEventLog, GrpcColorsEventLogMapping, GrpcColorsTrace, GrpcContextValue, GrpcCountAnnotation, GrpcDataset, GrpcDurationKind,
-  GrpcEdgeExecutionInfo, GrpcEntityCountAnnotation, GrpcEntityFrequencyAnnotation, GrpcEntityTimeAnnotation, GrpcEvent, GrpcEventAttribute,
-  GrpcEventCoordinates, GrpcEventLogInfo, GrpcEventLogTraceSubArraysContextValue, GrpcFrequenciesAnnotation, GrpcGeneralHistogramData,
+  GrpcActivityDurationData, GrpcActivityStartEndData, GrpcAnnotation, GrpcBytes, GrpcColor, GrpcColoredRectangle, GrpcColorsEventLog,
+  GrpcColorsEventLogMapping, GrpcColorsTrace, GrpcContextValue, GrpcCountAnnotation, GrpcDataset, GrpcDurationKind, GrpcEdgeExecutionInfo,
+  GrpcEntityCountAnnotation, GrpcEntityFrequencyAnnotation, GrpcEntityTimeAnnotation, GrpcEvent, GrpcEventAttribute, GrpcEventCoordinates,
+  GrpcEventLogInfo, GrpcEventLogTraceSubArraysContextValue, GrpcFrequenciesAnnotation, GrpcGeneralHistogramData,
   GrpcGenericEnhancementBase, GrpcGraph, GrpcGraphEdge, GrpcGraphEdgeAdditionalData, GrpcGraphKind, GrpcGraphNode, GrpcGuid,
   GrpcHashesEventLog, GrpcHashesEventLogContextValue, GrpcHashesLogTrace, GrpcHistogramEntry, GrpcLabeledDataset, GrpcLogPoint,
   GrpcLogTimelineDiagram, GrpcMatrix, GrpcMatrixRow, GrpcModelElementOcelAnnotation, GrpcMultithreadedFragment, GrpcNamesEventLog,
@@ -17,6 +13,11 @@ use crate::ficus_proto::{
   GrpcSubArrayWithTraceIndex, GrpcSubArraysWithTraceIndexContextValue, GrpcThread, GrpcThreadEvent, GrpcTimePerformanceAnnotation,
   GrpcTimeSpan, GrpcTimelineDiagramFragment, GrpcTimelineTraceEventsGroup, GrpcTraceSubArray, GrpcTraceSubArrays, GrpcTraceTimelineDiagram,
   GrpcUnderlyingPatternInfo, GrpcUnderlyingPatternKind,
+  grpc_annotation::Annotation::{CountAnnotation, FrequencyAnnotation, TimeAnnotation},
+  grpc_context_value::{ContextValue, ContextValue::Annotation},
+  grpc_event_attribute, grpc_graph_edge_additional_data,
+  grpc_node_additional_data::Data,
+  grpc_ocel_data,
 };
 use chrono::{DateTime, Utc};
 use ficus::{
@@ -104,8 +105,7 @@ use log::error;
 use nameof::name_of_type;
 use prost::{DecodeError, Message};
 use prost_types::Timestamp;
-use std::{any::Any, cell::RefCell, collections::HashMap, fmt::Display, rc::Rc, str::FromStr};
-use std::sync::Arc;
+use std::{any::Any, cell::RefCell, collections::HashMap, fmt::Display, rc::Rc, str::FromStr, sync::Arc};
 use uuid::Uuid;
 
 use super::pipeline_executor::ServicePipelineExecutionContext;
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/get_context_pipeline.rs b/Ficus/src/rust/ficus_backend/src/grpc/get_context_pipeline.rs
index cb29e17b8..f723defea 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/get_context_pipeline.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/get_context_pipeline.rs
@@ -9,8 +9,8 @@ use ficus::{
     context::{PipelineContext, PipelineInfrastructure},
     errors::pipeline_errors::{MissingContextError, PipelinePartExecutionError, RawPartExecutionError},
     keys::context_keys::{
-      find_context_key, CASE_NAME_KEY, EXECUTION_ID_KEY, PIPELINE_ID_KEY, PIPELINE_NAME_KEY, PROCESS_NAME_KEY, SUBSCRIPTION_ID_KEY,
-      SUBSCRIPTION_NAME_KEY, UNSTRUCTURED_METADATA_KEY,
+      CASE_NAME_KEY, EXECUTION_ID_KEY, PIPELINE_ID_KEY, PIPELINE_NAME_KEY, PROCESS_NAME_KEY, SUBSCRIPTION_ID_KEY, SUBSCRIPTION_NAME_KEY,
+      UNSTRUCTURED_METADATA_KEY, find_context_key,
     },
     pipelines::{DefaultPipelinePart, PipelinePart},
   },
@@ -63,7 +63,7 @@ impl GetContextValuePipelinePart {
           None => {
             return Err(PipelinePartExecutionError::Raw(RawPartExecutionError::new(
               "Execution ID is not supplied".to_string(),
-            )))
+            )));
           }
           Some(execution_id) => execution_id,
         };
@@ -128,7 +128,7 @@ impl GetContextValuePipelinePart {
         None => {
           return Err(PipelinePartExecutionError::MissingContext(MissingContextError::new(
             key.key().name().clone(),
-          )))
+          )));
         }
       }
     }
@@ -146,7 +146,7 @@ impl PipelinePart for GetContextValuePipelinePart {
         None => {
           return Err(PipelinePartExecutionError::MissingContext(MissingContextError::new(
             key_name.clone(),
-          )))
+          )));
         }
       }
     }
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/grpc_utils.rs b/Ficus/src/rust/ficus_backend/src/grpc/grpc_utils.rs
index c9c5a03db..a82678729 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/grpc_utils.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/grpc_utils.rs
@@ -1,6 +1,6 @@
 use crate::ficus_proto::{
-  grpc_kafka_result, GrpcAddPipelineRequest, GrpcAddPipelineStreamRequest, GrpcGuid, GrpcKafkaPipelineExecutionRequest, GrpcKafkaResult,
-  GrpcKafkaSuccessResult, GrpcPipelineExecutionRequest, GrpcPipelineStreamingConfiguration,
+  GrpcAddPipelineRequest, GrpcAddPipelineStreamRequest, GrpcGuid, GrpcKafkaPipelineExecutionRequest, GrpcKafkaResult,
+  GrpcKafkaSuccessResult, GrpcPipelineExecutionRequest, GrpcPipelineStreamingConfiguration, grpc_kafka_result,
 };
 use std::str::FromStr;
 use tonic::Status;
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
index c7e55c098..138550ada 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/grpc_kafka_service.rs
@@ -1,9 +1,8 @@
-use crate::ficus_proto::GrpcGetCurrentContextValuesRequest;
 use crate::{
   ficus_proto::{
     GrpcAddPipelineRequest, GrpcAddPipelineStreamRequest, GrpcExecutePipelineAndProduceKafkaRequest,
-    GrpcGetAllSubscriptionsAndPipelinesResponse, GrpcGuid, GrpcKafkaFailedResult, GrpcKafkaResult, GrpcKafkaSubscription,
-    GrpcKafkaSubscriptionMetadata, GrpcKafkaSuccessResult, GrpcPipelineMetadata, GrpcPipelinePartExecutionResult,
+    GrpcGetAllSubscriptionsAndPipelinesResponse, GrpcGetCurrentContextValuesRequest, GrpcGuid, GrpcKafkaFailedResult, GrpcKafkaResult,
+    GrpcKafkaSubscription, GrpcKafkaSubscriptionMetadata, GrpcKafkaSuccessResult, GrpcPipelineMetadata, GrpcPipelinePartExecutionResult,
     GrpcRemoveAllPipelinesRequest, GrpcRemovePipelineRequest, GrpcSubscribeToKafkaRequest, GrpcSubscriptionPipeline,
     GrpcUnsubscribeFromKafkaRequest, grpc_kafka_result, grpc_kafka_service_server::GrpcKafkaService,
   },
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
index e678c83dc..f1beb9561 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/kafka_service.rs
@@ -1,19 +1,17 @@
-use crate::grpc::context_values_service::ContextValueService;
-use crate::grpc::events::grpc_events_handler::GrpcPipelineEventsHandler;
-use crate::grpc::events::kafka_events_handler::ProcessCaseMetadata;
-use crate::grpc::kafka::models::ExtractedTraceMetadata;
 use crate::{
   ficus_proto::{
     GrpcContextKeyValue, GrpcGuid, GrpcKafkaConnectionMetadata, GrpcKafkaFailedResult, GrpcKafkaSuccessResult, GrpcPipeline,
     GrpcPipelineExecutionRequest, GrpcPipelineStreamingConfiguration, GrpcSubscribeToKafkaRequest, grpc_kafka_result,
   },
   grpc::{
+    context_values_service::ContextValueService,
     events::{
       events_handler::{EmptyPipelineEventsHandler, PipelineEvent, PipelineEventsHandler, PipelineFinalResult},
-      kafka_events_handler::{KafkaEventsHandler, PipelineEventsProducer},
+      grpc_events_handler::GrpcPipelineEventsHandler,
+      kafka_events_handler::{KafkaEventsHandler, PipelineEventsProducer, ProcessCaseMetadata},
     },
     kafka::{
-      models::{KafkaConsumerCreationDto, PipelineExecutionDto},
+      models::{ExtractedTraceMetadata, KafkaConsumerCreationDto, PipelineExecutionDto},
       streaming::{
         configs::StreamingConfiguration,
         processors::{KafkaTraceProcessingContext, TracesProcessor},
@@ -24,12 +22,17 @@ use crate::{
   },
 };
 use bxes_kafka::consumer::bxes_kafka_consumer::{BxesKafkaConsumer, BxesKafkaError, BxesKafkaTrace};
-use ficus::features::cases::CaseName;
-use ficus::pipelines::keys::context_keys::{
-  PIPELINE_ID_KEY, PIPELINE_NAME_KEY, PROCESS_NAME_KEY, SUBSCRIPTION_ID_KEY, SUBSCRIPTION_NAME_KEY, UNSTRUCTURED_METADATA_KEY,
+use ficus::{
+  features::cases::CaseName,
+  pipelines::{
+    context::LogMessageHandler,
+    keys::context_keys::{
+      PIPELINE_ID_KEY, PIPELINE_NAME_KEY, PROCESS_NAME_KEY, SUBSCRIPTION_ID_KEY, SUBSCRIPTION_NAME_KEY, UNSTRUCTURED_METADATA_KEY,
+    },
+    pipeline_parts::PipelineParts,
+  },
+  utils::user_data::user_data::UserData,
 };
-use ficus::pipelines::{context::LogMessageHandler, pipeline_parts::PipelineParts};
-use ficus::utils::user_data::user_data::UserData;
 use log::{debug, error, warn};
 use rdkafka::{ClientConfig, error::KafkaError};
 use std::{
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
index 5ff5b1ef8..bf1a5babf 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
@@ -2,13 +2,16 @@ use crate::grpc::{
   events::events_handler::PipelineEventsHandler, kafka::kafka_service::KafkaSubscription, logs_handler::ConsoleLogMessageHandler,
 };
 use bxes::models::domain::bxes_value::BxesValue;
-use ficus::features::cases::CaseName;
-use ficus::pipelines::context::PipelineContext;
-use ficus::pipelines::keys::context_keys::{CASE_NAME_KEY, PROCESS_NAME_KEY, UNSTRUCTURED_METADATA_KEY};
-use ficus::utils::user_data::user_data::UserData;
 use ficus::{
   event_log::bxes::bxes_to_xes_converter::BxesToXesReadError,
-  pipelines::{errors::pipeline_errors::PipelinePartExecutionError, pipeline_parts::PipelineParts},
+  features::cases::CaseName,
+  pipelines::{
+    context::PipelineContext,
+    errors::pipeline_errors::PipelinePartExecutionError,
+    keys::context_keys::{CASE_NAME_KEY, PROCESS_NAME_KEY, UNSTRUCTURED_METADATA_KEY},
+    pipeline_parts::PipelineParts,
+  },
+  utils::user_data::user_data::UserData,
 };
 use std::{
   collections::HashMap,
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs
index 241835ddc..28b96a44e 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/processors.rs
@@ -1,6 +1,5 @@
-use crate::grpc::kafka::models::ExtractedTraceMetadata;
 use crate::grpc::kafka::{
-  models::{KafkaTraceProcessingError, PipelineExecutionDto},
+  models::{ExtractedTraceMetadata, KafkaTraceProcessingError, PipelineExecutionDto},
   streaming::{t1::processors::T1StreamingProcessor, t2::processors::T2StreamingProcessor},
 };
 use bxes_kafka::consumer::bxes_kafka_consumer::BxesKafkaTrace;
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/configs.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/configs.rs
index df2ce493d..448a2e105 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/configs.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/configs.rs
@@ -1,5 +1,5 @@
 use crate::{
-  ficus_proto::{grpc_t1_streaming_configuration::Configuration, GrpcT1StreamingConfiguration},
+  ficus_proto::{GrpcT1StreamingConfiguration, grpc_t1_streaming_configuration::Configuration},
   grpc::kafka::streaming::t1::processors::T1StreamingProcessor,
 };
 use ficus::features::streaming::t1::{
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
index e635f7af4..a29e2b5c1 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t1/processors.rs
@@ -1,12 +1,14 @@
-use crate::grpc::kafka::models::{ExtractedTraceMetadata, string_value_or_err, uuid_or_err};
-use crate::grpc::kafka::streaming::processors::ProcessorState;
 use crate::grpc::{
-  kafka::models::{KAFKA_CASE_ID, KAFKA_CASE_NAME_PARTS, KAFKA_TRACE_ID, KafkaTraceProcessingError, XesFromBxesKafkaTraceCreatingError},
+  kafka::{
+    models::{
+      ExtractedTraceMetadata, KAFKA_CASE_ID, KAFKA_CASE_NAME_PARTS, KAFKA_TRACE_ID, KafkaTraceProcessingError,
+      XesFromBxesKafkaTraceCreatingError, string_value_or_err, uuid_or_err,
+    },
+    streaming::processors::ProcessorState,
+  },
   logs_handler::ConsoleLogMessageHandler,
 };
 use bxes_kafka::consumer::bxes_kafka_consumer::BxesKafkaTrace;
-use ficus::pipelines::keys::context_keys::EVENT_LOG_KEY;
-use ficus::utils::user_data::user_data::UserData;
 use ficus::{
   event_log::{
     bxes::bxes_to_xes_converter::read_bxes_events,
@@ -14,7 +16,11 @@ use ficus::{
     xes::xes_event_log::XesEventLogImpl,
   },
   features::streaming::t1::filterers::T1LogFilterer,
-  pipelines::context::{LogMessageHandler, PipelineContext},
+  pipelines::{
+    context::{LogMessageHandler, PipelineContext},
+    keys::context_keys::EVENT_LOG_KEY,
+  },
+  utils::user_data::user_data::UserData,
 };
 use log::{info, warn};
 use std::{
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/configs.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/configs.rs
index 26e02b007..4da2a886c 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/configs.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/configs.rs
@@ -1,5 +1,5 @@
 use crate::{
-  ficus_proto::{grpc_t2_streaming_configuration::Configuration, GrpcPipeline, GrpcT2StreamingConfiguration},
+  ficus_proto::{GrpcPipeline, GrpcT2StreamingConfiguration, grpc_t2_streaming_configuration::Configuration},
   grpc::kafka::streaming::t2::processors::T2StreamingProcessor,
 };
 use std::time::Duration;
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
index 93bcee194..5bab009b0 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/dfg_data_structures.rs
@@ -1,20 +1,23 @@
-use crate::grpc::kafka::models::XesFromBxesKafkaTraceCreatingError;
-use crate::grpc::kafka::models::{CaseMetadata, ProcessMetadata};
+use crate::grpc::kafka::models::{CaseMetadata, ProcessMetadata, XesFromBxesKafkaTraceCreatingError};
 use bxes::models::domain::bxes_value::BxesValue;
-use ficus::event_log::core::event::event::Event;
-use ficus::event_log::core::trace::trace::Trace;
-use ficus::event_log::xes::xes_trace::XesTraceImpl;
-use ficus::features::analysis::log_info::event_log_info::OfflineEventLogInfo;
-use ficus::features::streaming::counters::core::StreamingCounter;
-use ficus::features::streaming::counters::core::ValueUpdateKind;
-use ficus::features::streaming::counters::lossy_count::LossyCount;
-use ficus::features::streaming::counters::sliding_window::SlidingWindow;
-use ficus::pipelines::context::PipelineContext;
-use ficus::pipelines::keys::context_keys::EVENT_LOG_INFO_KEY;
-use ficus::utils::user_data::user_data::UserData;
+use ficus::{
+  event_log::{
+    core::{event::event::Event, trace::trace::Trace},
+    xes::xes_trace::XesTraceImpl,
+  },
+  features::{
+    analysis::log_info::event_log_info::OfflineEventLogInfo,
+    streaming::counters::{
+      core::{StreamingCounter, ValueUpdateKind},
+      lossy_count::LossyCount,
+      sliding_window::SlidingWindow,
+    },
+  },
+  pipelines::{context::PipelineContext, keys::context_keys::EVENT_LOG_INFO_KEY},
+  utils::user_data::user_data::UserData,
+};
 use log::{debug, info, warn};
-use std::{cell::RefCell, collections::HashMap, hash::Hash, rc::Rc, time::Duration};
-use std::sync::Arc;
+use std::{cell::RefCell, collections::HashMap, hash::Hash, rc::Rc, sync::Arc, time::Duration};
 use uuid::Uuid;
 
 #[derive(Clone)]
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/pipeline_executor.rs b/Ficus/src/rust/ficus_backend/src/grpc/pipeline_executor.rs
index 509d5927e..247eec2b7 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/pipeline_executor.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/pipeline_executor.rs
@@ -1,16 +1,13 @@
 use super::events::events_handler::PipelineEventsHandler;
-use crate::ficus_proto::GrpcContextKey;
-use crate::grpc::context_values_service::ContextValueService;
-use crate::grpc::converters::convert_to_grpc_context_value;
 use crate::{
-  ficus_proto::{GrpcContextKeyValue, GrpcPipeline, GrpcPipelinePart, grpc_pipeline_part_base::Part},
+  ficus_proto::{GrpcContextKey, GrpcContextKeyValue, GrpcPipeline, GrpcPipelinePart, grpc_pipeline_part_base::Part},
   grpc::{
-    converters::put_into_user_data,
+    context_values_service::ContextValueService,
+    converters::{convert_to_grpc_context_value, put_into_user_data},
     get_context_pipeline::GetContextValuePipelinePart,
     logs_handler::{ConsoleLogMessageHandler, DelegatingLogMessageHandler, GrpcLogMessageHandlerImpl},
   },
 };
-use ficus::utils::context_key::DefaultContextKey;
 use ficus::{
   pipelines::{
     context::{LogMessageHandler, PipelineContext, PipelineInfrastructure},
@@ -19,10 +16,12 @@ use ficus::{
     pipeline_parts::PipelineParts,
     pipelines::{DefaultPipelinePart, Pipeline, PipelinePart},
   },
-  utils::user_data::user_data::{UserData, UserDataImpl},
+  utils::{
+    context_key::DefaultContextKey,
+    user_data::user_data::{UserData, UserDataImpl},
+  },
 };
-use std::collections::HashMap;
-use std::{str::FromStr, sync::Arc};
+use std::{collections::HashMap, str::FromStr, sync::Arc};
 use uuid::Uuid;
 
 pub(super) struct ServicePipelineExecutionContext<'a> {
diff --git a/Ficus/src/rust/ficus_backend/src/main.rs b/Ficus/src/rust/ficus_backend/src/main.rs
index b329e78d1..c78ab582b 100644
--- a/Ficus/src/rust/ficus_backend/src/main.rs
+++ b/Ficus/src/rust/ficus_backend/src/main.rs
@@ -9,7 +9,7 @@ use crate::{
     kafka::grpc_kafka_service::GrpcKafkaServiceImpl,
   },
 };
-use log::{info, LevelFilter};
+use log::{LevelFilter, info};
 use std::sync::Arc;
 use tonic::transport::Server;
 
diff --git a/bxes/src/rust/bxes/src/models/domain/bxes_artifact.rs b/bxes/src/rust/bxes/src/models/domain/bxes_artifact.rs
index d6dab5203..1f8b2aaca 100644
--- a/bxes/src/rust/bxes/src/models/domain/bxes_artifact.rs
+++ b/bxes/src/rust/bxes/src/models/domain/bxes_artifact.rs
@@ -1,6 +1,8 @@
 use crate::models::domain::bxes_value::BxesValue;
-use std::sync::Arc;
-use std::hash::{Hash, Hasher};
+use std::{
+  hash::{Hash, Hasher},
+  sync::Arc,
+};
 
 #[derive(Debug, Clone)]
 pub struct BxesArtifact {
diff --git a/bxes/src/rust/bxes/src/models/domain/bxes_driver.rs b/bxes/src/rust/bxes/src/models/domain/bxes_driver.rs
index f4a87d3ff..58f352725 100644
--- a/bxes/src/rust/bxes/src/models/domain/bxes_driver.rs
+++ b/bxes/src/rust/bxes/src/models/domain/bxes_driver.rs
@@ -1,6 +1,8 @@
 use crate::models::domain::bxes_value::BxesValue;
-use std::sync::Arc;
-use std::hash::{Hash, Hasher};
+use std::{
+  hash::{Hash, Hasher},
+  sync::Arc,
+};
 
 #[derive(Debug, Clone)]
 pub struct BxesDrivers {
diff --git a/bxes/src/rust/bxes/src/models/domain/bxes_log_metadata.rs b/bxes/src/rust/bxes/src/models/domain/bxes_log_metadata.rs
index 640491bb8..2fc46ae57 100644
--- a/bxes/src/rust/bxes/src/models/domain/bxes_log_metadata.rs
+++ b/bxes/src/rust/bxes/src/models/domain/bxes_log_metadata.rs
@@ -1,5 +1,5 @@
-use std::sync::Arc;
 use num_derive::{FromPrimitive, ToPrimitive};
+use std::sync::Arc;
 use variant_count::VariantCount;
 
 use crate::models::domain::bxes_value::BxesValue;
diff --git a/bxes/src/rust/bxes/src/models/domain/bxes_value.rs b/bxes/src/rust/bxes/src/models/domain/bxes_value.rs
index 609133997..7861f2274 100644
--- a/bxes/src/rust/bxes/src/models/domain/bxes_value.rs
+++ b/bxes/src/rust/bxes/src/models/domain/bxes_value.rs
@@ -6,8 +6,8 @@ use crate::models::domain::{
 };
 use std::{
   hash::{Hash, Hasher},
+  sync::Arc,
 };
-use std::sync::Arc;
 
 #[derive(Clone, Debug)]
 pub enum BxesValue {
diff --git a/bxes/src/rust/bxes/src/models/domain/utils.rs b/bxes/src/rust/bxes/src/models/domain/utils.rs
index 64f9bf7d9..cd09b1f37 100644
--- a/bxes/src/rust/bxes/src/models/domain/utils.rs
+++ b/bxes/src/rust/bxes/src/models/domain/utils.rs
@@ -1,6 +1,5 @@
 use crate::models::domain::bxes_value::BxesValue;
-use std::collections::HashSet;
-use std::sync::Arc;
+use std::{collections::HashSet, sync::Arc};
 
 pub fn compare_list_of_attributes(
   first_attributes: &Option<Vec<(Arc<BxesValue>, Arc<BxesValue>)>>,
diff --git a/bxes/src/rust/bxes/src/read/read_utils.rs b/bxes/src/rust/bxes/src/read/read_utils.rs
index 7f11b342d..115163ebc 100644
--- a/bxes/src/rust/bxes/src/read/read_utils.rs
+++ b/bxes/src/rust/bxes/src/read/read_utils.rs
@@ -1,9 +1,9 @@
 use num_traits::FromPrimitive;
-use std::sync::Arc;
 use std::{
   fs::File,
   io::{Cursor, Read, Seek},
   rc::Rc,
+  sync::Arc,
 };
 use tempfile::TempDir;
 use uuid::Uuid;
diff --git a/bxes/src/rust/bxes/src/writer/errors.rs b/bxes/src/rust/bxes/src/writer/errors.rs
index 655e9345d..8270d9c70 100644
--- a/bxes/src/rust/bxes/src/writer/errors.rs
+++ b/bxes/src/rust/bxes/src/writer/errors.rs
@@ -1,6 +1,5 @@
-use std::fmt::Display;
-use std::sync::Arc;
 use crate::{binary_rw::error::BinaryError, models::domain::bxes_value::BxesValue};
+use std::{fmt::Display, sync::Arc};
 
 #[derive(Debug)]
 pub enum BxesWriteError {
diff --git a/bxes/src/rust/bxes/src/writer/write_context.rs b/bxes/src/rust/bxes/src/writer/write_context.rs
index a44834554..fb13a00ab 100644
--- a/bxes/src/rust/bxes/src/writer/write_context.rs
+++ b/bxes/src/rust/bxes/src/writer/write_context.rs
@@ -1,12 +1,12 @@
+use crate::{
+  binary_rw::core::BinaryWriter,
+  models::{domain::bxes_value::BxesValue, system_models::ValueAttributeDescriptor},
+};
 use std::{
   cell::RefCell,
   collections::{HashMap, HashSet},
   rc::Rc,
-};
-use std::sync::Arc;
-use crate::{
-  binary_rw::core::BinaryWriter,
-  models::{domain::bxes_value::BxesValue, system_models::ValueAttributeDescriptor},
+  sync::Arc,
 };
 
 pub struct BxesWriteContext<'b> {
diff --git a/bxes/src/rust/bxes/src/writer/writer_utils.rs b/bxes/src/rust/bxes/src/writer/writer_utils.rs
index c01fa9d1c..bd39398e9 100644
--- a/bxes/src/rust/bxes/src/writer/writer_utils.rs
+++ b/bxes/src/rust/bxes/src/writer/writer_utils.rs
@@ -1,3 +1,4 @@
+use num_traits::ToPrimitive;
 use std::{
   cell::RefCell,
   collections::HashMap,
@@ -5,9 +6,8 @@ use std::{
   io::Write,
   path::Path,
   rc::Rc,
+  sync::Arc,
 };
-use std::sync::Arc;
-use num_traits::ToPrimitive;
 use zip::{ZipWriter, write::FileOptions};
 
 use crate::{
diff --git a/bxes/src/rust/bxes/tests/test_core/random_log.rs b/bxes/src/rust/bxes/tests/test_core/random_log.rs
index b35a1e711..d4f351679 100644
--- a/bxes/src/rust/bxes/tests/test_core/random_log.rs
+++ b/bxes/src/rust/bxes/tests/test_core/random_log.rs
@@ -1,8 +1,7 @@
 use bxes::read::read_utils::string_or_err;
 use num_traits::FromPrimitive;
 use rand::{Rng, RngExt, distr::Alphanumeric, rngs::ThreadRng};
-use std::sync::Arc;
-use std::{collections::HashMap, rc::Rc};
+use std::{collections::HashMap, rc::Rc, sync::Arc};
 use uuid::Uuid;
 
 use bxes::{
diff --git a/bxes/src/rust/bxes_kafka/src/consumer/bxes_kafka_consumer.rs b/bxes/src/rust/bxes_kafka/src/consumer/bxes_kafka_consumer.rs
index d878e83fd..3513b3542 100644
--- a/bxes/src/rust/bxes_kafka/src/consumer/bxes_kafka_consumer.rs
+++ b/bxes/src/rust/bxes_kafka/src/consumer/bxes_kafka_consumer.rs
@@ -18,8 +18,7 @@ use rdkafka::{
   consumer::{BaseConsumer, CommitMode, Consumer},
   error::KafkaError,
 };
-use std::{collections::HashMap, io::Cursor, rc::Rc, time::Duration};
-use std::sync::Arc;
+use std::{collections::HashMap, io::Cursor, rc::Rc, sync::Arc, time::Duration};
 use uuid::Uuid;
 
 pub struct BxesKafkaConsumer {

From b36e3cd4e2aec5aa3e22038ba9e77dd8ba71bc2f Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Wed, 6 May 2026 14:01:36 +0300
Subject: [PATCH 44/53] Fix tests, remove unused imports

---
 .../rust/ficus/src/event_log/core/log_iterator.rs  |  2 +-
 .../src/features/analysis/entropy/dfg_entropy.rs   |  1 -
 .../discovery/heuristic/heuristic_miner.rs         |  1 -
 .../features/streaming/counters/sliding_window.rs  |  2 +-
 .../src/rust/ficus/src/pipelines/drawing_parts.rs  |  2 +-
 Ficus/src/rust/ficus/src/utils/references.rs       |  1 -
 .../ficus/tests/other/test_simple_event_log.rs     |  2 +-
 .../src/rust/ficus/tests/utils/user_data_tests.rs  | 14 +++++++-------
 8 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/Ficus/src/rust/ficus/src/event_log/core/log_iterator.rs b/Ficus/src/rust/ficus/src/event_log/core/log_iterator.rs
index b4e0fa06f..8b4886dcf 100644
--- a/Ficus/src/rust/ficus/src/event_log/core/log_iterator.rs
+++ b/Ficus/src/rust/ficus/src/event_log/core/log_iterator.rs
@@ -1,5 +1,5 @@
 use super::{event_log::EventLog, trace::trace::Trace};
-use std::{cell::RefCell, rc::Rc, sync::Arc};
+use std::{cell::RefCell, rc::Rc};
 
 pub struct LogIterator<TLog, TEventProcessor, TResult>
 where
diff --git a/Ficus/src/rust/ficus/src/features/analysis/entropy/dfg_entropy.rs b/Ficus/src/rust/ficus/src/features/analysis/entropy/dfg_entropy.rs
index a3078e81d..b84ace87e 100644
--- a/Ficus/src/rust/ficus/src/features/analysis/entropy/dfg_entropy.rs
+++ b/Ficus/src/rust/ficus/src/features/analysis/entropy/dfg_entropy.rs
@@ -10,7 +10,6 @@ use crate::{
 };
 use std::{
   collections::{HashMap, HashSet},
-  rc::Rc,
   sync::Arc,
 };
 
diff --git a/Ficus/src/rust/ficus/src/features/discovery/heuristic/heuristic_miner.rs b/Ficus/src/rust/ficus/src/features/discovery/heuristic/heuristic_miner.rs
index 86bd4844f..8bbe9b72c 100644
--- a/Ficus/src/rust/ficus/src/features/discovery/heuristic/heuristic_miner.rs
+++ b/Ficus/src/rust/ficus/src/features/discovery/heuristic/heuristic_miner.rs
@@ -12,7 +12,6 @@ use crate::{
 };
 use std::{
   collections::{HashMap, HashSet},
-  rc::Rc,
   sync::Arc,
 };
 
diff --git a/Ficus/src/rust/ficus/src/features/streaming/counters/sliding_window.rs b/Ficus/src/rust/ficus/src/features/streaming/counters/sliding_window.rs
index e8cbd66b0..cf49d5741 100644
--- a/Ficus/src/rust/ficus/src/features/streaming/counters/sliding_window.rs
+++ b/Ficus/src/rust/ficus/src/features/streaming/counters/sliding_window.rs
@@ -1,6 +1,6 @@
 use crate::features::streaming::counters::core::{StreamingCounter, StreamingCounterEntry, ValueUpdateKind};
 use chrono::{DateTime, Utc};
-use std::{collections::HashMap, hash::Hash, ops::Add, rc::Rc, sync::Arc, time::Duration};
+use std::{collections::HashMap, hash::Hash, ops::Add, sync::Arc, time::Duration};
 
 #[derive(Clone)]
 struct SlidingWindowEntry<TValue: Clone> {
diff --git a/Ficus/src/rust/ficus/src/pipelines/drawing_parts.rs b/Ficus/src/rust/ficus/src/pipelines/drawing_parts.rs
index 81121aa34..1d21cb4f2 100644
--- a/Ficus/src/rust/ficus/src/pipelines/drawing_parts.rs
+++ b/Ficus/src/rust/ficus/src/pipelines/drawing_parts.rs
@@ -18,7 +18,7 @@ use crate::{
   },
 };
 use fancy_regex::Regex;
-use std::{collections::HashMap, rc::Rc, sync::Arc};
+use std::{collections::HashMap, sync::Arc};
 
 impl PipelineParts {
   pipeline_part!(traces_diversity_diagram, |context: &mut PipelineContext, _, _| {
diff --git a/Ficus/src/rust/ficus/src/utils/references.rs b/Ficus/src/rust/ficus/src/utils/references.rs
index 7d7a4bf49..c3bafcb71 100644
--- a/Ficus/src/rust/ficus/src/utils/references.rs
+++ b/Ficus/src/rust/ficus/src/utils/references.rs
@@ -3,7 +3,6 @@ use std::{
   fmt::{Debug, Display, Formatter},
   hash::{Hash, Hasher},
   ops::Deref,
-  rc::Rc,
   sync::Arc,
 };
 
diff --git a/Ficus/src/rust/ficus/tests/other/test_simple_event_log.rs b/Ficus/src/rust/ficus/tests/other/test_simple_event_log.rs
index de4e28674..8f66dc5bc 100644
--- a/Ficus/src/rust/ficus/tests/other/test_simple_event_log.rs
+++ b/Ficus/src/rust/ficus/tests/other/test_simple_event_log.rs
@@ -5,7 +5,7 @@ use ficus::event_log::{
   core::{event::event::Event, event_log::EventLog, trace::trace::Trace},
   xes::{xes_event::XesEventImpl, xes_event_log::XesEventLogImpl},
 };
-use std::{rc::Rc, sync::Arc};
+use std::sync::Arc;
 
 #[test]
 fn test_simple_event_log_creation() {
diff --git a/Ficus/src/rust/ficus/tests/utils/user_data_tests.rs b/Ficus/src/rust/ficus/tests/utils/user_data_tests.rs
index 6db102342..205ee80e1 100644
--- a/Ficus/src/rust/ficus/tests/utils/user_data_tests.rs
+++ b/Ficus/src/rust/ficus/tests/utils/user_data_tests.rs
@@ -2,7 +2,7 @@ use ficus::utils::user_data::{
   keys::DefaultKey,
   user_data::{UserData, UserDataImpl},
 };
-use std::{rc::Rc, sync::Arc};
+use std::sync::Arc;
 
 #[test]
 fn test_user_data() {
@@ -22,10 +22,10 @@ fn test_user_data_two_keys() {
   let first_key = DefaultKey::<Arc<Box<usize>>>::new("1".to_string());
   let second_key = DefaultKey::<Arc<Box<usize>>>::new("2".to_string());
 
-  let first_value = Rc::new(Box::new(123));
-  let second_value = Rc::new(Box::new(321));
-  let box1 = Rc::clone(&first_value);
-  let box2 = Rc::clone(&second_value);
+  let first_value = Arc::new(Box::new(123));
+  let second_value = Arc::new(Box::new(321));
+  let box1 = Arc::clone(&first_value);
+  let box2 = Arc::clone(&second_value);
 
   let mut user_data = UserDataImpl::default();
 
@@ -35,8 +35,8 @@ fn test_user_data_two_keys() {
   assert_eq!(user_data.concrete(&first_key).unwrap(), &first_value);
   assert_eq!(user_data.concrete(&second_key).unwrap(), &second_value);
 
-  assert!(Rc::ptr_eq(user_data.get(&first_key).unwrap(), &first_value));
-  assert!(Rc::ptr_eq(user_data.get(&second_key).unwrap(), &second_value));
+  assert!(Arc::ptr_eq(user_data.get(&first_key).unwrap(), &first_value));
+  assert!(Arc::ptr_eq(user_data.get(&second_key).unwrap(), &second_value));
 }
 
 #[test]

From 2036806d262fb4035a7873533ef3ab4d955f406b Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Wed, 6 May 2026 14:26:02 +0300
Subject: [PATCH 45/53] Remove send and sync impls, move lock acquisition later

---
 Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs          | 3 ---
 .../ficus_backend/src/grpc/kafka/streaming/t2/processors.rs    | 3 +--
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
index bf1a5babf..865876d9a 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/models.rs
@@ -107,9 +107,6 @@ pub(super) struct ExtractedTraceMetadata {
   pub unstructured_metadata: Vec<(Arc<str>, Arc<str>)>,
 }
 
-unsafe impl Send for ExtractedTraceMetadata {}
-unsafe impl Sync for ExtractedTraceMetadata {}
-
 impl ExtractedTraceMetadata {
   pub fn create_from(metadata: &HashMap<Arc<str>, Arc<BxesValue>>) -> Result<Self, XesFromBxesKafkaTraceCreatingError> {
     Ok(ExtractedTraceMetadata {
diff --git a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/processors.rs b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/processors.rs
index e610a6981..78f405f60 100644
--- a/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/processors.rs
+++ b/Ficus/src/rust/ficus_backend/src/grpc/kafka/streaming/t2/processors.rs
@@ -46,8 +46,6 @@ impl T2StreamingProcessor {
   }
 
   pub fn observe(&self, context: &mut KafkaTraceProcessingContext) -> Result<(), KafkaTraceProcessingError> {
-    let mut dfg_data_structure = self.dfg_data_structure.lock().expect("Must acquire lock");
-
     let xes_trace = match read_bxes_events(context.trace.events()) {
       Ok(xes_trace) => xes_trace,
       Err(err) => {
@@ -90,6 +88,7 @@ impl T2StreamingProcessor {
       xes_trace
     };
 
+    let mut dfg_data_structure = self.dfg_data_structure.lock().expect("Must acquire lock");
     dfg_data_structure.invalidate();
 
     match dfg_data_structure.process_bxes_trace(context.trace.metadata(), &xes_trace) {

From 3522002a898bf484792f287d3ff43e9f31ca675f Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Wed, 6 May 2026 16:26:00 +0300
Subject: [PATCH 46/53] Update pipelines

---
 .../activities_ecfg_pipeline.py               |  72 +++++++------
 Ficus/examples/kafka_pipelines/common.py      | 102 ++++++++++--------
 Ficus/examples/kafka_pipelines/gc_pipeline.py |  54 +++++-----
 .../kafka_pipelines/kafka_pipeline.py         |  40 +++----
 .../names_log_kafka_pipeline.py               |  14 +--
 Ficus/examples/kafka_pipelines/streaming.py   |  16 +--
 6 files changed, 159 insertions(+), 139 deletions(-)

diff --git a/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py b/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py
index a700fb871..3f3f562da 100644
--- a/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py
+++ b/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py
@@ -1,39 +1,41 @@
-from common import execute_pipeline
+from common import execute_pipeline, pipeline_with_default_cfg
 from ficus import *
 
 execute_pipeline(
-    'MySubscription',
-    'Pipeline',
-    [
-        RemainOnlyMethodStartEvents(),
-        SetMethodsDisplayName(),
-        ShortenAllocationType(),
-        PrepareSoftwareLog(time_attribute = 'QpcStamp'),
-        TerminateIfEmptyLog(),
-        TracesDiversityDiagramCanvas(),
-        AddStartEndArtificialEvents(),
-        DiscoverLoopsStrict(),
-        CreateLogFromActivitiesInstances(strategy=UndefinedActivityHandlingStrategy.InsertAllEvents),
-        ClearActivitiesRelatedStuff(),
-        DiscoverActivitiesForSeveralLevels(['.*'],
-                                           PatternsKind.MaximalRepeats,
-                                           activity_filter_kind=ActivityFilterKind.NoFilter),
-        DrawFullActivitiesDiagramCanvas(plot_legend=False, height_scale=10, width_scale=0.01),
-        ClusterizeActivitiesFromTracesDbscan(min_events_count_in_cluster=2,
-                                             tolerance=0.1,
-                                             activities_repr_source=ActivitiesRepresentationSource.EventClasses,
-                                             distance=Distance.Cosine,
-                                             activity_level=0,
-                                             view_params=(30, 60),
-                                             legend_cols=4,
-                                             visualization_method=DatasetVisualizationMethod.TSNE,
-                                             n_components=NComponents.Three),
-        DrawFullActivitiesDiagramCanvas(plot_legend=False, height_scale=10, width_scale=0.01),
-        CreateLogFromActivitiesInstances(strategy=UndefinedActivityHandlingStrategy.InsertAllEvents),
-        ClearActivitiesRelatedStuff(),
-        TracesDiversityDiagramCanvas(),
-        DiscoverECFG(root_sequence_kind=RootSequenceKind.FindBest,
-                     merge_sequences_of_events=False),
-        AnnotateGraphWithTime(TimeAnnotationKind.Mean),
-    ]
+  'MySubscription',
+  'Pipeline',
+  [
+    pipeline_with_default_cfg([
+      RemainOnlyMethodStartEvents(),
+      SetMethodsDisplayName(),
+      ShortenAllocationType(),
+      PrepareSoftwareLog(time_attribute='QpcStamp'),
+      TerminateIfEmptyLog(),
+      TracesDiversityDiagramCanvas(),
+      AddStartEndArtificialEvents(),
+      DiscoverLoopsStrict(),
+      CreateLogFromActivitiesInstances(strategy=UndefinedActivityHandlingStrategy.InsertAllEvents),
+      ClearActivitiesRelatedStuff(),
+      DiscoverActivitiesForSeveralLevels(['.*'],
+                                         PatternsKind.MaximalRepeats,
+                                         activity_filter_kind=ActivityFilterKind.NoFilter),
+      DrawFullActivitiesDiagramCanvas(plot_legend=False, height_scale=10, width_scale=0.01),
+      ClusterizeActivitiesFromTracesDbscan(min_events_count_in_cluster=2,
+                                           tolerance=0.1,
+                                           activities_repr_source=ActivitiesRepresentationSource.EventClasses,
+                                           distance=Distance.Cosine,
+                                           activity_level=0,
+                                           view_params=(30, 60),
+                                           legend_cols=4,
+                                           visualization_method=DatasetVisualizationMethod.TSNE,
+                                           n_components=NComponents.Three),
+      DrawFullActivitiesDiagramCanvas(plot_legend=False, height_scale=10, width_scale=0.01),
+      CreateLogFromActivitiesInstances(strategy=UndefinedActivityHandlingStrategy.InsertAllEvents),
+      ClearActivitiesRelatedStuff(),
+      TracesDiversityDiagramCanvas(),
+      DiscoverECFG(root_sequence_kind=RootSequenceKind.FindBest,
+                   merge_sequences_of_events=False),
+      AnnotateGraphWithTime(TimeAnnotationKind.Mean),
+    ])
+  ]
 )
diff --git a/Ficus/examples/kafka_pipelines/common.py b/Ficus/examples/kafka_pipelines/common.py
index c548b05cf..dfe972f76 100644
--- a/Ficus/examples/kafka_pipelines/common.py
+++ b/Ficus/examples/kafka_pipelines/common.py
@@ -2,56 +2,66 @@
 import os
 import time
 
+
 def env_or_default(env_name: str, default: str):
-    env = os.getenv(env_name)
-    return env if env is not None else default
-
-def execute_pipeline(sub_name: str, pipeline_name: str, pipeline_parts: list[PipelinePart], trace_filtering_pipeline = Pipeline()):
-    consumer_servers = env_or_default('CONSUMER_BOOTSTRAP_SERVERS', 'localhost:9092')
-    consumer_topic = env_or_default('CONSUMER_TOPIC', 'my-topic')
-    consumer_group = env_or_default('CONSUMER_GROUP_ID', 'xd')
-
-    kafka_consumer_metadata = KafkaPipelineMetadata(
-        topic_name=consumer_topic,
-        kafka_consumer_configuration={
-            'bootstrap.servers': consumer_servers,
-            'group.id': consumer_group,
-            'auto.offset.reset': 'earliest',
-            'message.max.bytes': '25728640',
-        }
-    )
-
-    producer_servers = env_or_default('PRODUCER_BOOTSTRAP_SERVERS', 'localhost:9092')
-    producer_topic = env_or_default('PRODUCER_TOPIC', 'ficus-topic')
-
-    kafka_producer_metadata = KafkaPipelineMetadata(
-        topic_name=producer_topic,
-        kafka_consumer_configuration={
-            'bootstrap.servers': producer_servers,
-            'message.max.bytes': '25728640',
-        }
-    )
-
-    ficus_backend = env_or_default('FICUS_BACKEND', 'localhost:8080')
-
-    subscription_id = create_kafka_subscription(sub_name, kafka_consumer_metadata, ficus_backend)
-    if subscription_id is None:
-        return
-
-    with open(os.path.join(os.path.abspath(os.curdir), 'software_data_config.json'), "r") as f:
-        software_data_config = f.read()
+  env = os.getenv(env_name)
+  return env if env is not None else default
+
+
+def pipeline_with_default_cfg(pipeline_parts: list[PipelinePart]) -> (list[PipelinePart], str):
+  return pipeline_parts, os.path.join(os.path.abspath(os.curdir), 'software_data_config.json')
+
+
+def execute_pipeline(sub_name: str,
+                     pipeline_name: str,
+                     pipelines_parts: list[(list[PipelinePart], str)],
+                     trace_filtering_pipeline=Pipeline()):
+  consumer_servers = env_or_default('CONSUMER_BOOTSTRAP_SERVERS', 'localhost:9092')
+  consumer_topic = env_or_default('CONSUMER_TOPIC', 'my-topic')
+  consumer_group = env_or_default('CONSUMER_GROUP_ID', 'xd')
+
+  kafka_consumer_metadata = KafkaPipelineMetadata(
+    topic_name=consumer_topic,
+    kafka_consumer_configuration={
+      'bootstrap.servers': consumer_servers,
+      'group.id': consumer_group,
+      'auto.offset.reset': 'earliest',
+      'message.max.bytes': '25728640',
+    }
+  )
+
+  producer_servers = env_or_default('PRODUCER_BOOTSTRAP_SERVERS', 'localhost:9092')
+  producer_topic = env_or_default('PRODUCER_TOPIC', 'ficus-topic')
+
+  kafka_producer_metadata = KafkaPipelineMetadata(
+    topic_name=producer_topic,
+    kafka_consumer_configuration={
+      'bootstrap.servers': producer_servers,
+      'message.max.bytes': '25728640',
+    }
+  )
+
+  ficus_backend = env_or_default('FICUS_BACKEND', 'localhost:8080')
+
+  subscription_id = create_kafka_subscription(sub_name, kafka_consumer_metadata, ficus_backend)
+  if subscription_id is None:
+    return
+
+  for (pipeline_part, cfg_path) in pipelines_parts:
+    with open(cfg_path, "r") as f:
+      software_data_config = f.read()
 
     KafkaPipeline(
-        pipeline_parts
-    ).execute(ficus_backend, 
-              subscription_id, 
-              pipeline_name, 
-              kafka_producer_metadata, 
+      pipeline_part
+    ).execute(ficus_backend,
+              subscription_id,
+              pipeline_name,
+              kafka_producer_metadata,
               initial_context={
                 'software_data_extraction_config': JsonContextValue(software_data_config)
               },
-              streaming_configuration=create_queue_traces_configuration(3))
+              streaming_configuration=create_queue_traces_configuration(100))
 
-    if env_or_default('SLEEP', None) is not None:
-        while True:
-            time.sleep(10 ** 8)
+  if env_or_default('SLEEP', None) is not None:
+    while True:
+      time.sleep(10 ** 8)
diff --git a/Ficus/examples/kafka_pipelines/gc_pipeline.py b/Ficus/examples/kafka_pipelines/gc_pipeline.py
index cda334b59..53efad4d3 100644
--- a/Ficus/examples/kafka_pipelines/gc_pipeline.py
+++ b/Ficus/examples/kafka_pipelines/gc_pipeline.py
@@ -1,30 +1,32 @@
-from common import execute_pipeline
+from common import execute_pipeline, pipeline_with_default_cfg
 from ficus import *
 
 execute_pipeline(
-    'MySubscription',
-    'GCPipeline',
-    [
-        RemainEventsByRegex('GC/'),
-        FilterEventsByRegex('GC/RestartEEStart'),
-        FilterEventsByRegex('GC/RestartEEStop'),
-        FilterEventsByRegex('GC/SuspendEEStart'),
-        FilterEventsByRegex('GC/SuspendEEStop'),
-        FilterEventsByRegex('GC/Finaliz'),
-        FilterEventsByRegex('GC/SampledObject'),
-        FilterEventsByRegex('GC/SetGCHandle'),
-        FilterEventsByRegex('GC/BGCAllocWait'),
-        FilterEventsByRegex('GC/Pin'),
-        FilterEventsByRegex('GC/CreateSegment'),
-        FilterEventsByRegex('GC/Triggered'),
-        FilterEventsByRegex('GC/Join'),
-        FilterEventsByRegex('Heap'),
-        FilterEventsByRegex('Bulk'),
-        FilterEventsByRegex('Mark'),
-        ShortenAllocationType(),
-        ShortenMethodNames(),
-        AddStartEndArtificialEvents(),
-        DiscoverECFG(root_sequence_kind=RootSequenceKind.FindBest,
-                     merge_sequences_of_events=True),
-    ]
+  'MySubscription',
+  'GCPipeline',
+  [
+    pipeline_with_default_cfg([
+      RemainEventsByRegex('GC/'),
+      FilterEventsByRegex('GC/RestartEEStart'),
+      FilterEventsByRegex('GC/RestartEEStop'),
+      FilterEventsByRegex('GC/SuspendEEStart'),
+      FilterEventsByRegex('GC/SuspendEEStop'),
+      FilterEventsByRegex('GC/Finaliz'),
+      FilterEventsByRegex('GC/SampledObject'),
+      FilterEventsByRegex('GC/SetGCHandle'),
+      FilterEventsByRegex('GC/BGCAllocWait'),
+      FilterEventsByRegex('GC/Pin'),
+      FilterEventsByRegex('GC/CreateSegment'),
+      FilterEventsByRegex('GC/Triggered'),
+      FilterEventsByRegex('GC/Join'),
+      FilterEventsByRegex('Heap'),
+      FilterEventsByRegex('Bulk'),
+      FilterEventsByRegex('Mark'),
+      ShortenAllocationType(),
+      ShortenMethodNames(),
+      AddStartEndArtificialEvents(),
+      DiscoverECFG(root_sequence_kind=RootSequenceKind.FindBest,
+                   merge_sequences_of_events=True),
+    ])
+  ]
 )
diff --git a/Ficus/examples/kafka_pipelines/kafka_pipeline.py b/Ficus/examples/kafka_pipelines/kafka_pipeline.py
index d33df3759..9f4c5d185 100644
--- a/Ficus/examples/kafka_pipelines/kafka_pipeline.py
+++ b/Ficus/examples/kafka_pipelines/kafka_pipeline.py
@@ -1,23 +1,25 @@
-from common import execute_pipeline
+from common import execute_pipeline, pipeline_with_default_cfg
 from ficus import *
 
 execute_pipeline(
-    'MySubscription',
-    'Pipeline',
-    [
-        RemainOnlyMethodStartEvents(),
-        SetMethodsDisplayName(),
-        ShortenAllocationType(),
-        PrepareSoftwareLog(time_attribute = 'QpcStamp'),
-        TerminateIfEmptyLog(),
-        TracesDiversityDiagramCanvas(),
-        AddStartEndArtificialEvents(),
-        TracesDiversityDiagramCanvas(),
-        DiscoverLoopsStrict(),
-        CreateLogFromActivitiesInstances(strategy=UndefinedActivityHandlingStrategy.InsertAllEvents),
-        TracesDiversityDiagramCanvas(),
-        DiscoverECFG(root_sequence_kind=RootSequenceKind.FindBest,
-                     merge_sequences_of_events=False),
-        AnnotateGraphWithTime(TimeAnnotationKind.Mean),
-    ]
+  'MySubscription',
+  'Pipeline',
+  [
+    pipeline_with_default_cfg([
+      RemainOnlyMethodStartEvents(),
+      SetMethodsDisplayName(),
+      ShortenAllocationType(),
+      PrepareSoftwareLog(time_attribute='QpcStamp'),
+      TerminateIfEmptyLog(),
+      TracesDiversityDiagramCanvas(),
+      AddStartEndArtificialEvents(),
+      TracesDiversityDiagramCanvas(),
+      DiscoverLoopsStrict(),
+      CreateLogFromActivitiesInstances(strategy=UndefinedActivityHandlingStrategy.InsertAllEvents),
+      TracesDiversityDiagramCanvas(),
+      DiscoverECFG(root_sequence_kind=RootSequenceKind.FindBest,
+                   merge_sequences_of_events=False),
+      AnnotateGraphWithTime(TimeAnnotationKind.Mean),
+    ])
+  ]
 )
diff --git a/Ficus/examples/kafka_pipelines/names_log_kafka_pipeline.py b/Ficus/examples/kafka_pipelines/names_log_kafka_pipeline.py
index b760ac73b..fb9edd3fd 100644
--- a/Ficus/examples/kafka_pipelines/names_log_kafka_pipeline.py
+++ b/Ficus/examples/kafka_pipelines/names_log_kafka_pipeline.py
@@ -1,10 +1,12 @@
-from common import execute_pipeline
+from common import execute_pipeline, pipeline_with_default_cfg
 from ficus import *
 
 execute_pipeline(
-    'MySubscription',
-    'TestPipeline',
-    [
-        PrintEventLog()
-    ]
+  'MySubscription',
+  'TestPipeline',
+  [
+    pipeline_with_default_cfg([
+      PrintEventLog()
+    ])
+  ]
 )
diff --git a/Ficus/examples/kafka_pipelines/streaming.py b/Ficus/examples/kafka_pipelines/streaming.py
index 3b1f327cd..3561fbe4c 100644
--- a/Ficus/examples/kafka_pipelines/streaming.py
+++ b/Ficus/examples/kafka_pipelines/streaming.py
@@ -2,12 +2,14 @@
 from ficus import *
 
 execute_pipeline(
-    'MySubscription',
-    'StreamingPipeline',
+  'MySubscription',
+  'StreamingPipeline',
+  [
     [
-        ViewDirectlyFollowsGraphStream(),
-    ],
-    trace_filtering_pipeline=Pipeline(
-        RemainEventsByRegex('(Procfiler|Business)'),
-    )
+      ViewDirectlyFollowsGraphStream(),
+    ]
+  ],
+  trace_filtering_pipeline=Pipeline(
+    RemainEventsByRegex('(Procfiler|Business)'),
+  )
 )

From 55c66debee629f7cd76f5387018b4aba2032cc64 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Thu, 7 May 2026 14:25:30 +0300
Subject: [PATCH 47/53] Add pipeline for GC

---
 .../activities_ecfg_pipeline.py               | 48 ++++++++++++++++++-
 Ficus/examples/kafka_pipelines/gc_config.json | 13 +++++
 2 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 Ficus/examples/kafka_pipelines/gc_config.json

diff --git a/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py b/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py
index 3f3f562da..0b8d17c87 100644
--- a/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py
+++ b/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py
@@ -1,5 +1,6 @@
 from common import execute_pipeline, pipeline_with_default_cfg
 from ficus import *
+import os
 
 execute_pipeline(
   'MySubscription',
@@ -36,6 +37,51 @@
       DiscoverECFG(root_sequence_kind=RootSequenceKind.FindBest,
                    merge_sequences_of_events=False),
       AnnotateGraphWithTime(TimeAnnotationKind.Mean),
-    ])
+    ]),
+    (
+      [
+        RemainEventsByRegex('GC/'),
+        FilterEventsByRegex('GC/RestartEEStart'),
+        FilterEventsByRegex('GC/RestartEEStop'),
+        FilterEventsByRegex('GC/SuspendEEStart'),
+        FilterEventsByRegex('GC/SuspendEEStop'),
+        FilterEventsByRegex('GC/Finaliz'),
+        FilterEventsByRegex('GC/SampledObject'),
+        FilterEventsByRegex('GC/SetGCHandle'),
+        FilterEventsByRegex('GC/BGCAllocWait'),
+        FilterEventsByRegex('GC/Pin'),
+        FilterEventsByRegex('GC/CreateSegment'),
+        FilterEventsByRegex('GC/Triggered'),
+        TerminateIfEmptyLog(),
+        DiscoverCases(start_regex='GC/Start', end_regex='GC/Stop', inline_inner_cases=True, pipeline=Pipeline(
+          DiscoverMultithreadedDfg(thread_attribute='NativeThreadId'),
+          ViewGraph(export_path=os.path.join(os.path.abspath(os.curdir), 'multithreaded.png')),
+          DiscoverDirectlyFollowsGraph(),
+          ViewGraph(export_path=os.path.join(os.path.abspath(os.curdir), 'default.png')),
+          AbstractMultithreadedEventsGroups(
+            thread_attribute='NativeThreadId',
+            time_attribute='QpcStamp',
+            n_components=NComponents.Two,
+            distance=Distance.Cosine,
+            tolerance=0.1,
+            view_params=(-50, 20),
+            put_noise_events_in_one_cluster=False,
+            min_events_count_in_cluster=2,
+            feature_count_kind=FeatureCountKind.Count,
+            visualization_method=DatasetVisualizationMethod.TSNE,
+            after_clusterization_pipeline=Pipeline(
+              AddStartEndArtificialEvents(),
+              TracesDiversityDiagramCanvas(),
+              DiscoverLoopsStrict(),
+              CreateLogFromActivitiesInstances(strategy=UndefinedActivityHandlingStrategy.InsertAllEvents),
+              DiscoverECFG(root_sequence_kind=RootSequenceKind.FindBest,
+                           merge_sequences_of_events=False),
+              AnnotateGraphWithTime(TimeAnnotationKind.Mean),
+            )
+          ),
+        ))
+      ],
+      os.path.join(os.path.abspath(os.curdir), 'gc_config.json')
+    )
   ]
 )
diff --git a/Ficus/examples/kafka_pipelines/gc_config.json b/Ficus/examples/kafka_pipelines/gc_config.json
new file mode 100644
index 000000000..7b4ea4aaa
--- /dev/null
+++ b/Ficus/examples/kafka_pipelines/gc_config.json
@@ -0,0 +1,13 @@
+{
+  "allocation": {
+    "event_class_regex": "GC\/SampledObject",
+    "info": {
+      "type_name_attr": "TypeName",
+      "allocated_count_attr": "ObjectCountForTypeSample",
+      "total_allocated_bytes_attr": "TotalSizeForTypeSample"
+    }
+  },
+  "raw_control_flow_regexes": [
+    "^((?!GC\\/SampledObject).)*$"
+  ]
+}
\ No newline at end of file

From c49fbf253aafcfb0a40580d1b55efce0e73225e0 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Thu, 7 May 2026 17:58:37 +0300
Subject: [PATCH 48/53] Add names for pipelines

---
 .../activities_ecfg_pipeline.py               |  7 ++---
 Ficus/examples/kafka_pipelines/common.py      | 27 ++++++++++++++-----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py b/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py
index 0b8d17c87..830599bf2 100644
--- a/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py
+++ b/Ficus/examples/kafka_pipelines/activities_ecfg_pipeline.py
@@ -1,4 +1,4 @@
-from common import execute_pipeline, pipeline_with_default_cfg
+from common import execute_pipeline, pipeline_with_default_cfg, PipelinePartInfo
 from ficus import *
 import os
 
@@ -38,7 +38,7 @@
                    merge_sequences_of_events=False),
       AnnotateGraphWithTime(TimeAnnotationKind.Mean),
     ]),
-    (
+    PipelinePartInfo(
       [
         RemainEventsByRegex('GC/'),
         FilterEventsByRegex('GC/RestartEEStart'),
@@ -81,7 +81,8 @@
           ),
         ))
       ],
-      os.path.join(os.path.abspath(os.curdir), 'gc_config.json')
+      os.path.join(os.path.abspath(os.curdir), 'gc_config.json'),
+      'GC pipeline'
     )
   ]
 )
diff --git a/Ficus/examples/kafka_pipelines/common.py b/Ficus/examples/kafka_pipelines/common.py
index dfe972f76..d225da59b 100644
--- a/Ficus/examples/kafka_pipelines/common.py
+++ b/Ficus/examples/kafka_pipelines/common.py
@@ -1,3 +1,5 @@
+from dataclasses import dataclass
+
 from ficus import *
 import os
 import time
@@ -8,13 +10,24 @@ def env_or_default(env_name: str, default: str):
   return env if env is not None else default
 
 
-def pipeline_with_default_cfg(pipeline_parts: list[PipelinePart]) -> (list[PipelinePart], str):
-  return pipeline_parts, os.path.join(os.path.abspath(os.curdir), 'software_data_config.json')
+@dataclass
+class PipelinePartInfo:
+  parts: list[PipelinePart]
+  config_path: str
+  name: str
+
+
+def pipeline_with_default_cfg(pipeline_parts: list[PipelinePart]) -> PipelinePartInfo:
+  return PipelinePartInfo(
+    pipeline_parts,
+    os.path.join(os.path.abspath(os.curdir), 'software_data_config.json'),
+    'Pipeline'
+  )
 
 
 def execute_pipeline(sub_name: str,
                      pipeline_name: str,
-                     pipelines_parts: list[(list[PipelinePart], str)],
+                     pipelines: list[PipelinePartInfo],
                      trace_filtering_pipeline=Pipeline()):
   consumer_servers = env_or_default('CONSUMER_BOOTSTRAP_SERVERS', 'localhost:9092')
   consumer_topic = env_or_default('CONSUMER_TOPIC', 'my-topic')
@@ -47,15 +60,15 @@ def execute_pipeline(sub_name: str,
   if subscription_id is None:
     return
 
-  for (pipeline_part, cfg_path) in pipelines_parts:
-    with open(cfg_path, "r") as f:
+  for p in pipelines:
+    with open(p.config_path, "r") as f:
       software_data_config = f.read()
 
     KafkaPipeline(
-      pipeline_part
+      p.parts
     ).execute(ficus_backend,
               subscription_id,
-              pipeline_name,
+              p.name,
               kafka_producer_metadata,
               initial_context={
                 'software_data_extraction_config': JsonContextValue(software_data_config)

From 8cd3af07bda06e413a5e8247542837ca1c756ea0 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Thu, 7 May 2026 18:07:19 +0300
Subject: [PATCH 49/53] Fix gc extraction config

---
 Ficus/examples/kafka_pipelines/gc_config.json | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/Ficus/examples/kafka_pipelines/gc_config.json b/Ficus/examples/kafka_pipelines/gc_config.json
index 7b4ea4aaa..dd6f4b520 100644
--- a/Ficus/examples/kafka_pipelines/gc_config.json
+++ b/Ficus/examples/kafka_pipelines/gc_config.json
@@ -1,12 +1,24 @@
 {
-  "allocation": {
-    "event_class_regex": "GC\/SampledObject",
-    "info": {
-      "type_name_attr": "TypeName",
-      "allocated_count_attr": "ObjectCountForTypeSample",
-      "total_allocated_bytes_attr": "TotalSizeForTypeSample"
+  "pie_chart_extraction_configs": [
+    {
+      "event_class_regex": "GC\/SampledObject",
+      "info": {
+        "base": {
+          "name": "Object Allocations",
+          "units": "bytes"
+        },
+        "count_attr": "TotalSizeForTypeSample",
+        "grouping_attr": {
+          "single_attribute": {
+            "name": "TypeName",
+            "fallback_value": "UNRESOLVED"
+          }
+        }
+      }
     }
-  },
+  ],
+  "simple_counter_configs": [],
+  "activities_duration_configs": [],
   "raw_control_flow_regexes": [
     "^((?!GC\\/SampledObject).)*$"
   ]

From ef8bbede6eee14b47a8bd8b3cc2614ddfb2c096a Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneQ@yandex.ru>
Date: Thu, 7 May 2026 21:16:25 +0300
Subject: [PATCH 50/53] Some perf improvements

---
 .../ProcfilerOnline/Core/Handlers/IHandler.cs | 20 +++++++++---
 .../Core/ThreadsMethodsProcessor.cs           | 32 +++++++++++++++----
 .../Kafka/Bxes/BxesTracesKafkaProducer.cs     | 25 +++++++++------
 .../Bxes.Kafka/BxesKafkaStreamWriter.cs       |  4 +--
 4 files changed, 60 insertions(+), 21 deletions(-)

diff --git a/Procfiler/src/dotnet/ProcfilerOnline/Core/Handlers/IHandler.cs b/Procfiler/src/dotnet/ProcfilerOnline/Core/Handlers/IHandler.cs
index d183109f5..e2fa72428 100644
--- a/Procfiler/src/dotnet/ProcfilerOnline/Core/Handlers/IHandler.cs
+++ b/Procfiler/src/dotnet/ProcfilerOnline/Core/Handlers/IHandler.cs
@@ -1,4 +1,6 @@
 using Core.Container;
+using Core.Utils;
+using Microsoft.Extensions.Logging;
 
 namespace ProcfilerOnline.Core.Handlers;
 
@@ -15,14 +17,24 @@ public interface ICompositeEventPipeStreamEventHandler
 }
 
 [AppComponent]
-public class CompositeEventPipeStreamEventHandler(IEnumerable<IEventPipeStreamEventHandler> handlers)
+public class CompositeEventPipeStreamEventHandler(IProcfilerLogger logger, IEnumerable<IEventPipeStreamEventHandler> handlers)
   : ICompositeEventPipeStreamEventHandler
 {
   public void Handle(IEventPipeStreamEvent @event)
   {
-    foreach (var handler in handlers)
+    Task.Run(() =>
     {
-      handler.Handle(@event);
-    }
+      foreach (var handler in handlers)
+      {
+        try
+        {
+          handler.Handle(@event);
+        }
+        catch (Exception ex)
+        {
+          logger.LogError(ex, "Failed to execute handler {Handler}", handler.GetType().Name);
+        }
+      }
+    });
   }
 }
\ No newline at end of file
diff --git a/Procfiler/src/dotnet/ProcfilerOnline/Core/ThreadsMethodsProcessor.cs b/Procfiler/src/dotnet/ProcfilerOnline/Core/ThreadsMethodsProcessor.cs
index acd6a0335..4b33e73b4 100644
--- a/Procfiler/src/dotnet/ProcfilerOnline/Core/ThreadsMethodsProcessor.cs
+++ b/Procfiler/src/dotnet/ProcfilerOnline/Core/ThreadsMethodsProcessor.cs
@@ -16,13 +16,33 @@ public interface IThreadsMethodsProcessor
   IReadOnlyList<(long ThreadId, List<EventRecordWithMetadata>)> ReclaimNotClosedMethods();
 }
 
-public class TargetMethodFrame(long methodId, ExtendedMethodInfo? methodInfo)
+public class TargetMethodFrame
 {
-  public long MethodId { get; } = methodId;
-  public ExtendedMethodInfo? MethodInfo { get; } = methodInfo;
-  public Guid CaseId { get; } = Guid.NewGuid();
+  public long MethodId { get; private init; }
+  public ExtendedMethodInfo? MethodInfo { get; private init; }
+  public Guid CaseId { get; private init; } = Guid.NewGuid();
 
-  public List<EventRecordWithMetadata> InnerEvents { get; } = [];
+  public List<EventRecordWithMetadata> InnerEvents { get; private init; } = [];
+
+
+  private TargetMethodFrame()
+  {
+  }
+
+  public TargetMethodFrame(long methodId, ExtendedMethodInfo? methodInfo)
+  {
+    MethodId = methodId;
+    MethodInfo = methodInfo;
+  }
+
+
+  public TargetMethodFrame Clone() => new()
+  {
+    MethodId = MethodId,
+    MethodInfo = MethodInfo,
+    CaseId = CaseId,
+    InnerEvents = [..InnerEvents],
+  };
 }
 
 [AppComponent]
@@ -71,7 +91,7 @@ private void FlushMethods(EventProcessingContext context)
 
         handler.Handle(new MethodExecutionEvent
         {
-          Frame = frame,
+          Frame = frame.Clone(),
           ApplicationName = context.CommandContext.ApplicationName
         });
 
diff --git a/Procfiler/src/dotnet/ProcfilerOnline/Integrations/Kafka/Bxes/BxesTracesKafkaProducer.cs b/Procfiler/src/dotnet/ProcfilerOnline/Integrations/Kafka/Bxes/BxesTracesKafkaProducer.cs
index 1304cc360..104c5daac 100644
--- a/Procfiler/src/dotnet/ProcfilerOnline/Integrations/Kafka/Bxes/BxesTracesKafkaProducer.cs
+++ b/Procfiler/src/dotnet/ProcfilerOnline/Integrations/Kafka/Bxes/BxesTracesKafkaProducer.cs
@@ -37,6 +37,8 @@ public class BxesTracesKafkaProducer(IOptions<OnlineProcfilerSettings> settings,
 {
   private const char CaseNamePartsSeparator = ';';
 
+  private readonly Lock myLock = new();
+
 
   private readonly IBxesStreamWriter myWriter = new BxesKafkaStreamWriter<BxesEvent>(
     BxesUtil.CreateSystemMetadata(),
@@ -53,8 +55,10 @@ public void Produce(Guid key, BxesKafkaTrace trace)
     List<AttributeKeyValue> metadata =
     [
       new(new BxesStringValue(FicusKafkaKeys.CaseDisplayNameKey), new BxesStringValue(trace.CaseName.DisplayName)),
-      new(new BxesStringValue(FicusKafkaKeys.CaseNameParts),
-      new BxesStringValue(string.Join(CaseNamePartsSeparator, trace.CaseName.NameParts))),
+      new(
+        new BxesStringValue(FicusKafkaKeys.CaseNameParts),
+        new BxesStringValue(string.Join(CaseNamePartsSeparator, trace.CaseName.NameParts))
+      ),
       new(new BxesStringValue(FicusKafkaKeys.ProcessNameKey), new BxesStringValue(trace.ProcessName)),
       new(new BxesStringValue(FicusKafkaKeys.CaseId), new BxesGuidValue(trace.CaseId))
     ];
@@ -63,14 +67,17 @@ public void Produce(Guid key, BxesKafkaTrace trace)
 
     try
     {
-      myWriter.HandleEvent(new BxesTraceVariantStartEvent(1, metadata));
-
-      foreach (var eventRecord in trace.Trace)
+      lock (myLock)
       {
-        myWriter.HandleEvent(new BxesEventEvent<BxesEvent>(new BxesEvent(eventRecord, true)));
-      }
+        myWriter.HandleEvent(new BxesTraceVariantStartEvent(1, metadata));
 
-      myWriter.HandleEvent(BxesKafkaTraceVariantEndEvent.Instance);
+        foreach (var eventRecord in trace.Trace)
+        {
+          myWriter.HandleEvent(new BxesEventEvent<BxesEvent>(new BxesEvent(eventRecord, true)));
+        }
+
+        myWriter.HandleEvent(BxesKafkaTraceVariantEndEvent.Instance);
+      }
     }
     catch (Exception ex)
     {
@@ -78,7 +85,7 @@ public void Produce(Guid key, BxesKafkaTrace trace)
         ex,
         "Failed to produce bXES trace to kafka, process name: {ProcessName}, case name: {CaseName}, events count: {EventsCount}",
         trace.ProcessName,
-        trace.CaseName,
+        trace.CaseName.DisplayName,
         trace.Trace.Count
       );
     }
diff --git a/bxes/src/csharp/Bxes.Kafka/BxesKafkaStreamWriter.cs b/bxes/src/csharp/Bxes.Kafka/BxesKafkaStreamWriter.cs
index fe724299a..64be885b7 100644
--- a/bxes/src/csharp/Bxes.Kafka/BxesKafkaStreamWriter.cs
+++ b/bxes/src/csharp/Bxes.Kafka/BxesKafkaStreamWriter.cs
@@ -85,7 +85,7 @@ private void ProduceTrace()
   {
     if (myTraceInfo.Events.Count == 0) return;
 
-    myProducer.ProduceAsync(myTopicName, new Message<Guid, BxesKafkaTrace<TEvent>>
+    myProducer.Produce(myTopicName, new Message<Guid, BxesKafkaTrace<TEvent>>
     {
       Key = Guid.NewGuid(),
       Value = new BxesKafkaTrace<TEvent>
@@ -94,7 +94,7 @@ private void ProduceTrace()
         Metadata = myTraceInfo.Metadata,
         Events = myTraceInfo.Events
       }
-    }).GetAwaiter().GetResult();
+    });
   }
 
   public void Dispose()

From f8683429611fdd23551d1ddf18c8723d3f87c794 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneq@yandex.ru>
Date: Sat, 9 May 2026 00:12:34 +0300
Subject: [PATCH 51/53] Wait for running handlers

---
 .../ProcfilerOnline/Core/AppExitHandler.cs    |  9 +++++-
 .../ProcfilerOnline/Core/Handlers/IHandler.cs | 31 ++++++++++++++-----
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/Procfiler/src/dotnet/ProcfilerOnline/Core/AppExitHandler.cs b/Procfiler/src/dotnet/ProcfilerOnline/Core/AppExitHandler.cs
index c7271b7e7..e5ca29340 100644
--- a/Procfiler/src/dotnet/ProcfilerOnline/Core/AppExitHandler.cs
+++ b/Procfiler/src/dotnet/ProcfilerOnline/Core/AppExitHandler.cs
@@ -2,6 +2,7 @@
 using Core.Container;
 using Core.Utils;
 using Microsoft.Extensions.Logging;
+using ProcfilerOnline.Core.Handlers;
 using ProcfilerOnline.Core.Statistics;
 
 namespace ProcfilerOnline.Core;
@@ -18,12 +19,17 @@ public class AppExitHandler : IAppExitHandler
 {
   private readonly IProcfilerLogger myLogger;
   private readonly IStatisticsManager myStatisticsManager;
+  private readonly ICompositeEventPipeStreamEventHandler myEventHandler;
   private readonly HashSet<WeakReference<Process>> myRegisteredProcesses = [];
 
-  public AppExitHandler(IProcfilerLogger logger, IStatisticsManager statisticsManager)
+  public AppExitHandler(
+    IProcfilerLogger logger,
+    IStatisticsManager statisticsManager,
+    ICompositeEventPipeStreamEventHandler eventHandler)
   {
     myLogger = logger;
     myStatisticsManager = statisticsManager;
+    myEventHandler = eventHandler;
     Console.CancelKeyPress += (_, args) => { HandleAppExit(args); };
   }
 
@@ -36,6 +42,7 @@ public void PerformExitActions()
   {
     using var _ = new PerformanceCookie($"{GetType().Name}::{nameof(HandleAppExit)}", myLogger);
 
+    myEventHandler.WaitAllActiveHandlers();
     myStatisticsManager.Log(myLogger);
 
     foreach (var processRef in myRegisteredProcesses)
diff --git a/Procfiler/src/dotnet/ProcfilerOnline/Core/Handlers/IHandler.cs b/Procfiler/src/dotnet/ProcfilerOnline/Core/Handlers/IHandler.cs
index e2fa72428..3e46a8db4 100644
--- a/Procfiler/src/dotnet/ProcfilerOnline/Core/Handlers/IHandler.cs
+++ b/Procfiler/src/dotnet/ProcfilerOnline/Core/Handlers/IHandler.cs
@@ -14,27 +14,44 @@ public interface IEventPipeStreamEvent;
 public interface ICompositeEventPipeStreamEventHandler
 {
   void Handle(IEventPipeStreamEvent eventPipeStreamEvent);
+  void WaitAllActiveHandlers();
 }
 
 [AppComponent]
 public class CompositeEventPipeStreamEventHandler(IProcfilerLogger logger, IEnumerable<IEventPipeStreamEventHandler> handlers)
   : ICompositeEventPipeStreamEventHandler
 {
+  private int myExecutingHandlers;
+
+
   public void Handle(IEventPipeStreamEvent @event)
   {
     Task.Run(() =>
     {
-      foreach (var handler in handlers)
+      try
       {
-        try
+        Interlocked.Increment(ref myExecutingHandlers);
+        foreach (var handler in handlers)
         {
-          handler.Handle(@event);
-        }
-        catch (Exception ex)
-        {
-          logger.LogError(ex, "Failed to execute handler {Handler}", handler.GetType().Name);
+          try
+          {
+            handler.Handle(@event);
+          }
+          catch (Exception ex)
+          {
+            logger.LogError(ex, "Failed to execute handler {Handler}", handler.GetType().Name);
+          }
         }
       }
+      finally
+      {
+        Interlocked.Decrement(ref myExecutingHandlers);
+      }
     });
   }
+
+  public void WaitAllActiveHandlers()
+  {
+    SpinWait.SpinUntil(() => Interlocked.CompareExchange(ref myExecutingHandlers, -1, 0) == 0);
+  }
 }
\ No newline at end of file

From 0df00b9d6cbc66f706cfb3e2b1fbbf7df99d9116 Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneq@yandex.ru>
Date: Sat, 9 May 2026 00:14:51 +0300
Subject: [PATCH 52/53] Add timeout in test consumer

---
 .../IntegrationTests/Kafka/MethodExecutionKafkaConsumer.cs   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Procfiler/src/dotnet/OnlineProcfilerTests/IntegrationTests/Kafka/MethodExecutionKafkaConsumer.cs b/Procfiler/src/dotnet/OnlineProcfilerTests/IntegrationTests/Kafka/MethodExecutionKafkaConsumer.cs
index 47df0c9ce..0cf30a080 100644
--- a/Procfiler/src/dotnet/OnlineProcfilerTests/IntegrationTests/Kafka/MethodExecutionKafkaConsumer.cs
+++ b/Procfiler/src/dotnet/OnlineProcfilerTests/IntegrationTests/Kafka/MethodExecutionKafkaConsumer.cs
@@ -37,7 +37,10 @@ public MethodExecutionKafkaConsumer(OnlineProcfilerSettings settings)
     var messages = new List<(List<AttributeKeyValue> Metadata, List<IEvent> Events)>();
     while (true)
     {
-      var result = myConsumer.Consume();
+      var source = new CancellationTokenSource();
+      source.CancelAfter(TimeSpan.FromSeconds(10));
+
+      var result = myConsumer.Consume(source.Token);
       if (result.IsPartitionEOF) break;
 
       var bxesTrace = myBxesKafkaConsumer.Consume(result.Message.Value);

From 3c7799e8b406723ae449370fd9f6605995f1b77a Mon Sep 17 00:00:00 2001
From: aerooneqq <aerooneq@yandex.ru>
Date: Sat, 9 May 2026 22:15:19 +0300
Subject: [PATCH 53/53] Fix online procfiler kafka integration tests

---
 .../Kafka/OnlineProcfilerKafkaTests.cs        |  21 +-
 .../AllSolutionsTest.gold                     | 922 ------------------
 .../IntegrationTest.gold                      |  44 +
 .../AllSolutionsTest.gold                     | 922 ------------------
 .../IntegrationTest.gold                      |  44 +
 .../AllSolutionsTest.gold                     | 922 ------------------
 .../IntegrationTest.gold                      |  44 +
 7 files changed, 140 insertions(+), 2779 deletions(-)
 delete mode 100644 Procfiler/test_data/gold/linux/OnlineProcfilerKafkaTests/AllSolutionsTest.gold
 create mode 100644 Procfiler/test_data/gold/linux/OnlineProcfilerKafkaTests/IntegrationTest.gold
 delete mode 100644 Procfiler/test_data/gold/macos/OnlineProcfilerKafkaTests/AllSolutionsTest.gold
 create mode 100644 Procfiler/test_data/gold/macos/OnlineProcfilerKafkaTests/IntegrationTest.gold
 delete mode 100644 Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/AllSolutionsTest.gold
 create mode 100644 Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/IntegrationTest.gold

diff --git a/Procfiler/src/dotnet/OnlineProcfilerTests/IntegrationTests/Kafka/OnlineProcfilerKafkaTests.cs b/Procfiler/src/dotnet/OnlineProcfilerTests/IntegrationTests/Kafka/OnlineProcfilerKafkaTests.cs
index a13d83329..1531e1fff 100644
--- a/Procfiler/src/dotnet/OnlineProcfilerTests/IntegrationTests/Kafka/OnlineProcfilerKafkaTests.cs
+++ b/Procfiler/src/dotnet/OnlineProcfilerTests/IntegrationTests/Kafka/OnlineProcfilerKafkaTests.cs
@@ -19,27 +19,22 @@ public class OnlineProcfilerKafkaTests : OnlineProcfilerTestWithGold
 {
   protected override IEnumerable<IEventPipeStreamEventHandler> HandlersToRegister { get; } = [];
 
-
   [Test]
-  public void AllSolutionsTest() => Execute(() => DoExecuteTest(KnownSolution.AllSolutionsLatestFramework));
-
-
-  private string DoExecuteTest(IEnumerable<KnownSolution> solutions)
+  public void IntegrationTest() => Execute(() =>
   {
+    //TODO: test against all solutions
     var settings = Container.Resolve<IOptions<OnlineProcfilerSettings>>().Value;
-    var consumer = new MethodExecutionKafkaConsumer(settings);
+    using var consumer = new MethodExecutionKafkaConsumer(settings);
     var sb = new StringBuilder();
+    var solution = KnownSolution.ConsoleApp1;
 
-    foreach (var solution in solutions)
-    {
-      var globalData = ExecuteTest(solution) ?? throw new Exception();
-      var traces = ConsumeAllEvents(consumer);
+    var globalData = ExecuteTest(KnownSolution.ConsoleApp1) ?? throw new Exception();
+    var traces = ConsumeAllEvents(consumer);
 
-      AddSerializedTracesToGold(solution, globalData, traces, sb);
-    }
+    AddSerializedTracesToGold(solution, globalData, traces, sb);
 
     return sb.ToString();
-  }
+  });
 
   private static Traces ConsumeAllEvents(MethodExecutionKafkaConsumer consumer) =>
     consumer.ConsumeAllEvents()
diff --git a/Procfiler/test_data/gold/linux/OnlineProcfilerKafkaTests/AllSolutionsTest.gold b/Procfiler/test_data/gold/linux/OnlineProcfilerKafkaTests/AllSolutionsTest.gold
deleted file mode 100644
index bc59ce2be..000000000
--- a/Procfiler/test_data/gold/linux/OnlineProcfilerKafkaTests/AllSolutionsTest.gold
+++ /dev/null
@@ -1,922 +0,0 @@
-ConsoleApp1 Program .ctor instance void  ()
-Trace:
-	[start] ConsoleApp1.Program..ctor[instance.void..()]
-	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-
-
-ConsoleApp1 Program .ctor instance void  ()
-Trace:
-	[start] ConsoleApp1.Program..ctor[instance.void..()]
-	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-
-
-ConsoleApp1 Program Main void  ()
-Trace:
-	[start] ConsoleApp1.Program.Main[void..()]
-		[start] ConsoleApp1.Program.Method1[void..()]
-			[start] ConsoleApp1.Program..ctor[instance.void..()]
-			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-			[start] ConsoleApp1.Program.Method2[void..()]
-			[ end ] ConsoleApp1.Program.Method2[void..()]
-			[start] ConsoleApp1.Program..ctor[instance.void..()]
-			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-		[ end ] ConsoleApp1.Program.Method1[void..()]
-	[ end ] ConsoleApp1.Program.Main[void..()]
-
-
-ConsoleApp1 Program Method1 void  ()
-Trace:
-	[start] ConsoleApp1.Program.Method1[void..()]
-		[start] ConsoleApp1.Program..ctor[instance.void..()]
-		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-		[start] ConsoleApp1.Program.Method2[void..()]
-		[ end ] ConsoleApp1.Program.Method2[void..()]
-		[start] ConsoleApp1.Program..ctor[instance.void..()]
-		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-	[ end ] ConsoleApp1.Program.Method1[void..()]
-
-
-ConsoleApp1 Program Method2 void  ()
-Trace:
-	[start] ConsoleApp1.Program.Method2[void..()]
-	[ end ] ConsoleApp1.Program.Method2[void..()]
-
-
-TaskTestProject1 Program Main void  (class System.String[])
-Trace:
-	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
-		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
-		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
-	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
-
-
-TaskTestProject1 Program+<>c__DisplayClass0_0 .ctor instance void  ()
-Trace:
-	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
-	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
-
-
-TaskTestProject1 Program+<>c__DisplayClass0_0 <Main>b__0 instance int32  ()
-Trace:
-	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
-	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
-
-
-TaskTestProject1 Program+<>c__DisplayClass0_0 <Main>b__1 instance void  (class System.Threading.Tasks.Task`1<int32>)
-Trace:
-	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
-	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
-
-
-ExceptionTryCatchFinally Program .ctor instance void  ()
-Trace:
-	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
-	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
-
-
-ExceptionTryCatchFinally Program <Main>g__ThrowException|0_0 void  ()
-Trace:
-	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
-	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
-
-
-ExceptionTryCatchFinally Program Main void  (class System.String[])
-Trace:
-	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
-		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
-		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
-		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
-		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
-	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
-
-
-FileWriteProject Program <Main> void  (class System.String[])
-Trace:
-	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
-		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
-			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
-	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
-
-
-FileWriteProject Program async_<Main>d__0
-Trace:
-	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-
-
-FileWriteProject Program Main class System.Threading.Tasks.Task  (class System.String[])
-Trace:
-	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
-		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
-
-
-FileWriteProject Program+<Main>d__0 .ctor instance void  ()
-Trace:
-	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-
-
-FileWriteProject Program+<Main>d__0 MoveNext instance void  ()
-Trace:
-	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-
-
-DynamicAssemblyLoading Program Main void  (class System.String[])
-Trace:
-	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
-	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
-
-
-DynamicAssemblyCreation Program Main void  (class System.String[])
-Trace:
-	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
-	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
-
-
-ExceptionTryCatchFinallyWhen Program <Main>g__Throw|0_0 void  ()
-Trace:
-	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
-	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
-
-
-ExceptionTryCatchFinallyWhen Program Main void  (class System.String[])
-Trace:
-	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
-		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
-		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
-	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject Program Main void  (class System.String[])
-Trace:
-	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
-
-
-IntensiveThreadPoolUse Program Main void  (class System.String[])
-Trace:
-	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
-	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
-
-
-UnsafeFixed Program Main void  (class System.String[])
-Trace:
-	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
-	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
-
-
-SystemArrayPooling Program Main void  (class System.String[])
-Trace:
-	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
-	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
-
-
-NotExistingAssemblyLoading Program Main void  (class System.String[])
-Trace:
-	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
-		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
-			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
-		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
-		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
-		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
-		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
-	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
-
-
-NotExistingAssemblyLoading Program+<>c .cctor void  ()
-Trace:
-	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
-		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
-
-
-NotExistingAssemblyLoading Program+<>c .ctor instance void  ()
-Trace:
-	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-
-
-NotExistingAssemblyLoading Program+<>c <Main>b__0_0 instance class System.Reflection.Assembly  (class System.Object,class System.ResolveEventArgs)
-Trace:
-	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
-	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
-
-
-NotExistingAssemblyLoading Program+<>c <Main>b__0_1 instance class System.Reflection.Assembly  (class System.Runtime.Loader.AssemblyLoadContext,class System.Reflection.AssemblyName)
-Trace:
-	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
-	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
-
-
-LOHAllocations Program Main void  (class System.String[])
-Trace:
-	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
-	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
-
-
diff --git a/Procfiler/test_data/gold/linux/OnlineProcfilerKafkaTests/IntegrationTest.gold b/Procfiler/test_data/gold/linux/OnlineProcfilerKafkaTests/IntegrationTest.gold
new file mode 100644
index 000000000..dbb8245ab
--- /dev/null
+++ b/Procfiler/test_data/gold/linux/OnlineProcfilerKafkaTests/IntegrationTest.gold
@@ -0,0 +1,44 @@
+ConsoleApp1 Program .ctor instance void  ()
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+
+ConsoleApp1 Program .ctor instance void  ()
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+
+ConsoleApp1 Program Main void  ()
+Trace:
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+
+ConsoleApp1 Program Method1 void  ()
+Trace:
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+
+ConsoleApp1 Program Method2 void  ()
+Trace:
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
+
diff --git a/Procfiler/test_data/gold/macos/OnlineProcfilerKafkaTests/AllSolutionsTest.gold b/Procfiler/test_data/gold/macos/OnlineProcfilerKafkaTests/AllSolutionsTest.gold
deleted file mode 100644
index bc59ce2be..000000000
--- a/Procfiler/test_data/gold/macos/OnlineProcfilerKafkaTests/AllSolutionsTest.gold
+++ /dev/null
@@ -1,922 +0,0 @@
-ConsoleApp1 Program .ctor instance void  ()
-Trace:
-	[start] ConsoleApp1.Program..ctor[instance.void..()]
-	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-
-
-ConsoleApp1 Program .ctor instance void  ()
-Trace:
-	[start] ConsoleApp1.Program..ctor[instance.void..()]
-	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-
-
-ConsoleApp1 Program Main void  ()
-Trace:
-	[start] ConsoleApp1.Program.Main[void..()]
-		[start] ConsoleApp1.Program.Method1[void..()]
-			[start] ConsoleApp1.Program..ctor[instance.void..()]
-			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-			[start] ConsoleApp1.Program.Method2[void..()]
-			[ end ] ConsoleApp1.Program.Method2[void..()]
-			[start] ConsoleApp1.Program..ctor[instance.void..()]
-			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-		[ end ] ConsoleApp1.Program.Method1[void..()]
-	[ end ] ConsoleApp1.Program.Main[void..()]
-
-
-ConsoleApp1 Program Method1 void  ()
-Trace:
-	[start] ConsoleApp1.Program.Method1[void..()]
-		[start] ConsoleApp1.Program..ctor[instance.void..()]
-		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-		[start] ConsoleApp1.Program.Method2[void..()]
-		[ end ] ConsoleApp1.Program.Method2[void..()]
-		[start] ConsoleApp1.Program..ctor[instance.void..()]
-		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-	[ end ] ConsoleApp1.Program.Method1[void..()]
-
-
-ConsoleApp1 Program Method2 void  ()
-Trace:
-	[start] ConsoleApp1.Program.Method2[void..()]
-	[ end ] ConsoleApp1.Program.Method2[void..()]
-
-
-TaskTestProject1 Program Main void  (class System.String[])
-Trace:
-	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
-		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
-		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
-	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
-
-
-TaskTestProject1 Program+<>c__DisplayClass0_0 .ctor instance void  ()
-Trace:
-	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
-	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
-
-
-TaskTestProject1 Program+<>c__DisplayClass0_0 <Main>b__0 instance int32  ()
-Trace:
-	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
-	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
-
-
-TaskTestProject1 Program+<>c__DisplayClass0_0 <Main>b__1 instance void  (class System.Threading.Tasks.Task`1<int32>)
-Trace:
-	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
-	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
-
-
-ExceptionTryCatchFinally Program .ctor instance void  ()
-Trace:
-	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
-	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
-
-
-ExceptionTryCatchFinally Program <Main>g__ThrowException|0_0 void  ()
-Trace:
-	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
-	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
-
-
-ExceptionTryCatchFinally Program Main void  (class System.String[])
-Trace:
-	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
-		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
-		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
-		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
-		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
-	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
-
-
-FileWriteProject Program <Main> void  (class System.String[])
-Trace:
-	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
-		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
-			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
-	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
-
-
-FileWriteProject Program async_<Main>d__0
-Trace:
-	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-
-
-FileWriteProject Program Main class System.Threading.Tasks.Task  (class System.String[])
-Trace:
-	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
-		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
-
-
-FileWriteProject Program+<Main>d__0 .ctor instance void  ()
-Trace:
-	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-
-
-FileWriteProject Program+<Main>d__0 MoveNext instance void  ()
-Trace:
-	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-
-
-DynamicAssemblyLoading Program Main void  (class System.String[])
-Trace:
-	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
-	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
-
-
-DynamicAssemblyCreation Program Main void  (class System.String[])
-Trace:
-	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
-	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
-
-
-ExceptionTryCatchFinallyWhen Program <Main>g__Throw|0_0 void  ()
-Trace:
-	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
-	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
-
-
-ExceptionTryCatchFinallyWhen Program Main void  (class System.String[])
-Trace:
-	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
-		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
-		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
-	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject Program Main void  (class System.String[])
-Trace:
-	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
-
-
-IntensiveThreadPoolUse Program Main void  (class System.String[])
-Trace:
-	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
-	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
-
-
-UnsafeFixed Program Main void  (class System.String[])
-Trace:
-	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
-	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
-
-
-SystemArrayPooling Program Main void  (class System.String[])
-Trace:
-	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
-	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
-
-
-NotExistingAssemblyLoading Program Main void  (class System.String[])
-Trace:
-	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
-		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
-			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
-		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
-		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
-		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
-		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
-	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
-
-
-NotExistingAssemblyLoading Program+<>c .cctor void  ()
-Trace:
-	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
-		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
-
-
-NotExistingAssemblyLoading Program+<>c .ctor instance void  ()
-Trace:
-	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-
-
-NotExistingAssemblyLoading Program+<>c <Main>b__0_0 instance class System.Reflection.Assembly  (class System.Object,class System.ResolveEventArgs)
-Trace:
-	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
-	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
-
-
-NotExistingAssemblyLoading Program+<>c <Main>b__0_1 instance class System.Reflection.Assembly  (class System.Runtime.Loader.AssemblyLoadContext,class System.Reflection.AssemblyName)
-Trace:
-	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
-	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
-
-
-LOHAllocations Program Main void  (class System.String[])
-Trace:
-	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
-	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
-
-
diff --git a/Procfiler/test_data/gold/macos/OnlineProcfilerKafkaTests/IntegrationTest.gold b/Procfiler/test_data/gold/macos/OnlineProcfilerKafkaTests/IntegrationTest.gold
new file mode 100644
index 000000000..dbb8245ab
--- /dev/null
+++ b/Procfiler/test_data/gold/macos/OnlineProcfilerKafkaTests/IntegrationTest.gold
@@ -0,0 +1,44 @@
+ConsoleApp1 Program .ctor instance void  ()
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+
+ConsoleApp1 Program .ctor instance void  ()
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+
+ConsoleApp1 Program Main void  ()
+Trace:
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+
+ConsoleApp1 Program Method1 void  ()
+Trace:
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+
+ConsoleApp1 Program Method2 void  ()
+Trace:
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
+
diff --git a/Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/AllSolutionsTest.gold b/Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/AllSolutionsTest.gold
deleted file mode 100644
index bc59ce2be..000000000
--- a/Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/AllSolutionsTest.gold
+++ /dev/null
@@ -1,922 +0,0 @@
-ConsoleApp1 Program .ctor instance void  ()
-Trace:
-	[start] ConsoleApp1.Program..ctor[instance.void..()]
-	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-
-
-ConsoleApp1 Program .ctor instance void  ()
-Trace:
-	[start] ConsoleApp1.Program..ctor[instance.void..()]
-	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-
-
-ConsoleApp1 Program Main void  ()
-Trace:
-	[start] ConsoleApp1.Program.Main[void..()]
-		[start] ConsoleApp1.Program.Method1[void..()]
-			[start] ConsoleApp1.Program..ctor[instance.void..()]
-			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-			[start] ConsoleApp1.Program.Method2[void..()]
-			[ end ] ConsoleApp1.Program.Method2[void..()]
-			[start] ConsoleApp1.Program..ctor[instance.void..()]
-			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-		[ end ] ConsoleApp1.Program.Method1[void..()]
-	[ end ] ConsoleApp1.Program.Main[void..()]
-
-
-ConsoleApp1 Program Method1 void  ()
-Trace:
-	[start] ConsoleApp1.Program.Method1[void..()]
-		[start] ConsoleApp1.Program..ctor[instance.void..()]
-		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-		[start] ConsoleApp1.Program.Method2[void..()]
-		[ end ] ConsoleApp1.Program.Method2[void..()]
-		[start] ConsoleApp1.Program..ctor[instance.void..()]
-		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
-	[ end ] ConsoleApp1.Program.Method1[void..()]
-
-
-ConsoleApp1 Program Method2 void  ()
-Trace:
-	[start] ConsoleApp1.Program.Method2[void..()]
-	[ end ] ConsoleApp1.Program.Method2[void..()]
-
-
-TaskTestProject1 Program Main void  (class System.String[])
-Trace:
-	[start] TaskTestProject1.Program.Main[void..(class.System.String[])]
-		[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
-		[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
-	[ end ] TaskTestProject1.Program.Main[void..(class.System.String[])]
-
-
-TaskTestProject1 Program+<>c__DisplayClass0_0 .ctor instance void  ()
-Trace:
-	[start] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
-	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0..ctor[instance.void..()]
-
-
-TaskTestProject1 Program+<>c__DisplayClass0_0 <Main>b__0 instance int32  ()
-Trace:
-	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
-	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__0[instance.int32..()]
-
-
-TaskTestProject1 Program+<>c__DisplayClass0_0 <Main>b__1 instance void  (class System.Threading.Tasks.Task`1<int32>)
-Trace:
-	[start] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
-	[ end ] TaskTestProject1.Program+<>c__DisplayClass0_0.<Main>b__1[instance.void..(class.System.Threading.Tasks.Task`1<int32>)]
-
-
-ExceptionTryCatchFinally Program .ctor instance void  ()
-Trace:
-	[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
-	[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
-
-
-ExceptionTryCatchFinally Program <Main>g__ThrowException|0_0 void  ()
-Trace:
-	[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
-	[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
-
-
-ExceptionTryCatchFinally Program Main void  (class System.String[])
-Trace:
-	[start] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
-		[start] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
-		[ end ] ExceptionTryCatchFinally.Program.<Main>g__ThrowException|0_0[void..()]
-		[start] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
-		[ end ] ExceptionTryCatchFinally.Program..ctor[instance.void..()]
-	[ end ] ExceptionTryCatchFinally.Program.Main[void..(class.System.String[])]
-
-
-FileWriteProject Program <Main> void  (class System.String[])
-Trace:
-	[start] FileWriteProject.Program.<Main>[void..(class.System.String[])]
-		[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
-			[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-			[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-			[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-			[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-		[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
-	[ end ] FileWriteProject.Program.<Main>[void..(class.System.String[])]
-
-
-FileWriteProject Program async_<Main>d__0
-Trace:
-	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-
-
-FileWriteProject Program Main class System.Threading.Tasks.Task  (class System.String[])
-Trace:
-	[start] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
-		[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-		[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-		[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-		[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-	[ end ] FileWriteProject.Program.Main[class.System.Threading.Tasks.Task..(class.System.String[])]
-
-
-FileWriteProject Program+<Main>d__0 .ctor instance void  ()
-Trace:
-	[start] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-	[ end ] FileWriteProject.Program+<Main>d__0..ctor[instance.void..()]
-
-
-FileWriteProject Program+<Main>d__0 MoveNext instance void  ()
-Trace:
-	[start] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-	[ end ] FileWriteProject.Program+<Main>d__0.MoveNext[instance.void..()]
-
-
-DynamicAssemblyLoading Program Main void  (class System.String[])
-Trace:
-	[start] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
-	[ end ] DynamicAssemblyLoading.Program.Main[void..(class.System.String[])]
-
-
-DynamicAssemblyCreation Program Main void  (class System.String[])
-Trace:
-	[start] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
-	[ end ] DynamicAssemblyCreation.Program.Main[void..(class.System.String[])]
-
-
-ExceptionTryCatchFinallyWhen Program <Main>g__Throw|0_0 void  ()
-Trace:
-	[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
-	[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
-
-
-ExceptionTryCatchFinallyWhen Program Main void  (class System.String[])
-Trace:
-	[start] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
-		[start] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
-		[ end ] ExceptionTryCatchFinallyWhen.Program.<Main>g__Throw|0_0[void..()]
-	[ end ] ExceptionTryCatchFinallyWhen.Program.Main[void..(class.System.String[])]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer .ctor instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject ClassWithFinalizer Finalize instance void  ()
-Trace:
-	[start] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-	[ end ] FinalizableObject.ClassWithFinalizer.Finalize[instance.void..()]
-
-
-FinalizableObject Program Main void  (class System.String[])
-Trace:
-	[start] FinalizableObject.Program.Main[void..(class.System.String[])]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[start] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-		[ end ] FinalizableObject.ClassWithFinalizer..ctor[instance.void..()]
-	[ end ] FinalizableObject.Program.Main[void..(class.System.String[])]
-
-
-IntensiveThreadPoolUse Program Main void  (class System.String[])
-Trace:
-	[start] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
-	[ end ] IntensiveThreadPoolUse.Program.Main[void..(class.System.String[])]
-
-
-UnsafeFixed Program Main void  (class System.String[])
-Trace:
-	[start] UnsafeFixed.Program.Main[void..(class.System.String[])]
-	[ end ] UnsafeFixed.Program.Main[void..(class.System.String[])]
-
-
-SystemArrayPooling Program Main void  (class System.String[])
-Trace:
-	[start] SystemArrayPooling.Program.Main[void..(class.System.String[])]
-	[ end ] SystemArrayPooling.Program.Main[void..(class.System.String[])]
-
-
-NotExistingAssemblyLoading Program Main void  (class System.String[])
-Trace:
-	[start] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
-		[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
-			[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-			[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-		[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
-		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
-		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
-		[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
-		[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
-	[ end ] NotExistingAssemblyLoading.Program.Main[void..(class.System.String[])]
-
-
-NotExistingAssemblyLoading Program+<>c .cctor void  ()
-Trace:
-	[start] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
-		[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-		[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-	[ end ] NotExistingAssemblyLoading.Program+<>c..cctor[void..()]
-
-
-NotExistingAssemblyLoading Program+<>c .ctor instance void  ()
-Trace:
-	[start] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-	[ end ] NotExistingAssemblyLoading.Program+<>c..ctor[instance.void..()]
-
-
-NotExistingAssemblyLoading Program+<>c <Main>b__0_0 instance class System.Reflection.Assembly  (class System.Object,class System.ResolveEventArgs)
-Trace:
-	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
-	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_0[instance.class.System.Reflection.Assembly..(class.System.Object,class.System.ResolveEventArgs)]
-
-
-NotExistingAssemblyLoading Program+<>c <Main>b__0_1 instance class System.Reflection.Assembly  (class System.Runtime.Loader.AssemblyLoadContext,class System.Reflection.AssemblyName)
-Trace:
-	[start] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
-	[ end ] NotExistingAssemblyLoading.Program+<>c.<Main>b__0_1[instance.class.System.Reflection.Assembly..(class.System.Runtime.Loader.AssemblyLoadContext,class.System.Reflection.AssemblyName)]
-
-
-LOHAllocations Program Main void  (class System.String[])
-Trace:
-	[start] LOHAllocations.Program.Main[void..(class.System.String[])]
-	[ end ] LOHAllocations.Program.Main[void..(class.System.String[])]
-
-
diff --git a/Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/IntegrationTest.gold b/Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/IntegrationTest.gold
new file mode 100644
index 000000000..dbb8245ab
--- /dev/null
+++ b/Procfiler/test_data/gold/windows/OnlineProcfilerKafkaTests/IntegrationTest.gold
@@ -0,0 +1,44 @@
+ConsoleApp1 Program .ctor instance void  ()
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+
+ConsoleApp1 Program .ctor instance void  ()
+Trace:
+	[start] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+
+
+ConsoleApp1 Program Main void  ()
+Trace:
+	[start] ConsoleApp1.Program.Main[void..()]
+		[start] ConsoleApp1.Program.Method1[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+			[start] ConsoleApp1.Program.Method2[void..()]
+			[ end ] ConsoleApp1.Program.Method2[void..()]
+			[start] ConsoleApp1.Program..ctor[instance.void..()]
+			[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program.Method1[void..()]
+	[ end ] ConsoleApp1.Program.Main[void..()]
+
+
+ConsoleApp1 Program Method1 void  ()
+Trace:
+	[start] ConsoleApp1.Program.Method1[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+		[start] ConsoleApp1.Program.Method2[void..()]
+		[ end ] ConsoleApp1.Program.Method2[void..()]
+		[start] ConsoleApp1.Program..ctor[instance.void..()]
+		[ end ] ConsoleApp1.Program..ctor[instance.void..()]
+	[ end ] ConsoleApp1.Program.Method1[void..()]
+
+
+ConsoleApp1 Program Method2 void  ()
+Trace:
+	[start] ConsoleApp1.Program.Method2[void..()]
+	[ end ] ConsoleApp1.Program.Method2[void..()]
+
+