Merge release/7.x to main

eng/AfterSolutionBuild.targets

@@ -4,11 +4,12 @@
   <Import Project="$(RepoRoot)src\archives\AzureBlobStorage\ProjectsToPublish.props" />
   <Import Project="$(RepoRoot)src\archives\S3Storage\ProjectsToPublish.props" />
   <Import Project="$(RepoRoot)src\Microsoft.Diagnostics.Monitoring.StartupHook\ProjectsToPublish.props" />
+  <Import Project="$(RepoRoot)src\singlefile\dotnet-monitor\ProjectsToPublish.props" />
 
   <!-- Only publish projects after build if opt-in and not skipped -->
   <Target Name="PublishProjectsAfterBuild"
           AfterTargets="Build"
-          Condition="'$(PublishProjectsAfterBuild)' == 'true' and '$(SkipPublishProjects)' != 'true'">
+          Condition="'$(PublishProjectsAfterBuild)' == 'true' and '$(CreateArchives)' != 'true' and '$(CreateSingleFileBundles)' != 'true' and '$(SkipPublishProjects)' != 'true'">
     <CallTarget Targets="PublishProjects" />
   </Target>
 

eng/Build.props

@@ -6,4 +6,6 @@
           Condition="'$(CreateArchives)' == 'true'" />
   <Import Project="$(RepoRoot)src\archives\S3Storage\ProjectsToBuild.props"
           Condition="'$(CreateArchives)' == 'true'" />
+  <Import Project="$(RepoRoot)src\singlefile\dotnet-monitor\ProjectsToBuild.props"
+          Condition="'$(CreateSingleFileBundles)' == 'true'" />
 </Project>

eng/Common.props

@@ -4,5 +4,6 @@
     <LatestTargetFramework>net8.0</LatestTargetFramework>
     <LatestToolTargetFramework>$(LatestTargetFramework)</LatestToolTargetFramework>
     <OlderToolTargetFramework>net6.0</OlderToolTargetFramework>
+    <ArtifactsNonShippingBundlesDir>$(ArtifactsDir)bundles\$(Configuration)\NonShipping\</ArtifactsNonShippingBundlesDir>
   </PropertyGroup>
 </Project>

eng/PublishProjects.targets

@@ -1,7 +1,6 @@
 <Project>
 
   <PropertyGroup>
-    <SharedPublishProjectProperties>SelfContained=false</SharedPublishProjectProperties>
     <SharedPublishProjectProperties>$(SharedPublishProjectProperties);UseAppHost=true</SharedPublishProjectProperties>
     <SharedPublishProjectProperties>$(SharedPublishProjectProperties);PackAsTool=false</SharedPublishProjectProperties>
   </PropertyGroup>

eng/Publishing.props

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <PublishDependsOnTargets>$(PublishDependsOnTargets);CollectPackageArtifactFiles;CollectVersionArtifactFiles</PublishDependsOnTargets>
+    <PublishDependsOnTargets>$(PublishDependsOnTargets);CollectPackageArtifactFiles;CollectBundleArtifactFiles;CollectVersionArtifactFiles</PublishDependsOnTargets>
   </PropertyGroup>
 
   <ItemGroup>
@@ -18,6 +18,10 @@
     <PackageFile Include="$(ArtifactsNonShippingPackagesDir)**/*.zip" IsShipping="false" />
   </ItemGroup>
 
+  <ItemGroup>
+    <BundleFile Include="$(ArtifactsNonShippingBundlesDir)*" IsShipping="false" />
+  </ItemGroup>
+
   <Target Name="CalculateBlobGroupAndBuildVersion">
     <PropertyGroup>
       <!--
@@ -200,6 +204,20 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="CollectBundleArtifactFiles"
+          DependsOnTargets="CalculateBlobGroupAndBuildVersion">
+    <ItemGroup>
+      <ItemsToPushToBlobFeed Include="@(BundleFile)"
+                             RemoveMetadata="IsShipping"
+                             Condition="'$(_BuildVersion)' != ''">
+        <!-- Place blobs into versioned container so that stable versions (or lack of version) do not collide. -->
+        <RelativeBlobPath>diagnostics/monitor/$(_BuildVersion)/%(BundleFile.Filename)%(BundleFile.Extension)</RelativeBlobPath>
+        <ManifestArtifactData Condition="'%(BundleFile.IsShipping)' != 'true'">NonShipping=true</ManifestArtifactData>
+        <PublishFlatContainer>true</PublishFlatContainer>
+      </ItemsToPushToBlobFeed>
+    </ItemGroup>
+  </Target>
+
   <Target Name="CollectVersionArtifactFiles"
           DependsOnTargets="CalculateBlobGroupAndBuildVersion">
     <PropertyGroup>

eng/dependabot/Versions.props

@@ -22,6 +22,10 @@
     <SwashbuckleAspNetCoreVersion>6.5.0</SwashbuckleAspNetCoreVersion>
     <AwsSdkS3Version>3.5.8.1</AwsSdkS3Version>
 
+    <!-- Release-branch specific reference -->
+    <!-- dotnet/diagnostics references -->
+    <MicrosoftDiagnosticsMonitoringShippedVersion>7.0.430602</MicrosoftDiagnosticsMonitoringShippedVersion>
+
     <!--
       Moq version & constants derived from Moq.
       The MoqInternalsVisibleTo* properties are not managed by Dependabot and may need to be updated incase a new version of Moq ever changes them.

eng/pipelines/jobs/build-archive.yml

@@ -36,6 +36,7 @@ jobs:
       -skipmanaged
       -skipnative
       /p:SkipPublishProjects=true
+      /p:CreateSingleFileBundles=true
       /p:ThirdPartyNoticesFilePath='$(Build.SourcesDirectory)/$(_TPNFile)'
 
     postBuildSteps:
@@ -44,6 +45,12 @@ jobs:
       inputs:
         SourceFolder: '$(Build.SourcesDirectory)/artifacts/packages'
         TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages'
+
+    - task: CopyFiles@2
+      displayName: Gather Artifacts (bundles)
+      inputs:
+        SourceFolder: '$(Build.SourcesDirectory)/artifacts/bundles'
+        TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bundles'
 
     - task: PublishBuildArtifacts@1
       displayName: Publish Artifacts (Unified)

src/Microsoft.Diagnostics.Monitoring.Options/OptionsDisplayStrings.resx

@@ -490,12 +490,13 @@
     <comment>The description provided for the DumpTempFolder parameter on StorageOptions.</comment>
   </data>
   <data name="ErrorMessage_CredentialsMissing" xml:space="preserve">
-    <value>The {0} field, {1} field, or {2} field is required.</value>
-    <comment>Gets the format string for rejecting validation due to 3 missing fields where at least one is required.
-3 Format Parameters:
+    <value>The {0} field, {1} field, {2} field, or {3} field is required.</value>
+    <comment>Gets the format string for rejecting validation due to 4 missing fields where at least one is required.
+4 Format Parameters:
 0. fieldNameOne: The name of the first field that is missing
 1. fieldNameTwo: The name of the second field that is missing
-2. fieldNameThree: The name of the third field that is missing</comment>
+2. fieldNameThree: The name of the third field that is missing
+3. fieldNameFour: The name of the fourth field that is missing</comment>
   </data>
   <data name="DisplayAttributeDescription_CollectLogsOptions_Format" xml:space="preserve">
     <value>The format of the logs artifact.</value>

src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/CurrentAppDomainExceptionProcessor.cs

@@ -24,8 +24,11 @@ public void Start()
 
         private static void ConfigurePipeline(ExceptionPipelineBuilder builder)
         {
+            // Process current exception and its inner exceptions
+            builder.Add(next => new ExceptionDemultiplexerPipelineStep(next).Invoke);
             // Prevent rethrows from being evaluated; only care about origination of exceptions.
             builder.Add(next => new FilterRepeatExceptionPipelineStep(next).Invoke);
+            // Report exception through event source
             builder.Add(next => new ExceptionEventsPipelineStep(next).Invoke);
         }
     }

src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/CurrentAppDomainExceptionSource.cs

@@ -25,6 +25,8 @@ public CurrentAppDomainExceptionSource()
 
         private void CurrentDomain_FirstChanceException(object? sender, FirstChanceExceptionEventArgs e)
         {
+            DateTime timestamp = DateTime.UtcNow;
+
             if (_handlingException.Value)
             {
                 // Exception handling is already in progress on this thread. The current exception is likely
@@ -38,7 +40,7 @@ private void CurrentDomain_FirstChanceException(object? sender, FirstChanceExcep
             {
                 _handlingException.Value = true;
 
-                RaiseExceptionThrown(e.Exception);
+                RaiseExceptionThrown(e.Exception, timestamp);
             }
             catch
             {

src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Eventing/ExceptionsEventSource.cs

@@ -46,35 +46,47 @@ protected override void Dispose(bool disposing)
             base.Dispose(disposing);
         }
 
-        [Event(ExceptionEvents.EventIds.ExceptionIdentifier)]
-        public void ExceptionIdentifier(
-            ulong ExceptionId,
+        [Event(ExceptionEvents.EventIds.ExceptionGroup)]
+        public void ExceptionGroup(
+            ulong ExceptionGroupId,
             ulong ExceptionClassId,
             ulong ThrowingMethodId,
             int ILOffset)
         {
             Span<EventData> data = stackalloc EventData[4];
 
-            SetValue(ref data[ExceptionEvents.ExceptionIdentifierPayloads.ExceptionId], ExceptionId);
-            SetValue(ref data[ExceptionEvents.ExceptionIdentifierPayloads.ExceptionClassId], ExceptionClassId);
-            SetValue(ref data[ExceptionEvents.ExceptionIdentifierPayloads.ThrowingMethodId], ThrowingMethodId);
-            SetValue(ref data[ExceptionEvents.ExceptionIdentifierPayloads.ILOffset], ILOffset);
+            SetValue(ref data[ExceptionEvents.ExceptionGroupPayloads.ExceptionGroupId], ExceptionGroupId);
+            SetValue(ref data[ExceptionEvents.ExceptionGroupPayloads.ExceptionClassId], ExceptionClassId);
+            SetValue(ref data[ExceptionEvents.ExceptionGroupPayloads.ThrowingMethodId], ThrowingMethodId);
+            SetValue(ref data[ExceptionEvents.ExceptionGroupPayloads.ILOffset], ILOffset);
 
-            WriteEventCore(ExceptionEvents.EventIds.ExceptionIdentifier, data);
+            WriteEventCore(ExceptionEvents.EventIds.ExceptionGroup, data);
 
             RestartFlushingEventTimer();
         }
 
         [Event(ExceptionEvents.EventIds.ExceptionInstance)]
         public void ExceptionInstance(
             ulong ExceptionId,
-            string? ExceptionMessage)
+            ulong ExceptionGroupId,
+            string? ExceptionMessage,
+            ulong[] StackFrameIds,
+            DateTime Timestamp,
+            ulong[] InnerExceptionIds)
         {
-            Span<EventData> data = stackalloc EventData[2];
+            Span<EventData> data = stackalloc EventData[6];
             using PinnedData namePinned = PinnedData.Create(ExceptionMessage);
+            Span<byte> stackFrameIdsSpan = stackalloc byte[GetArrayDataSize(StackFrameIds)];
+            FillArrayData(stackFrameIdsSpan, StackFrameIds);
+            Span<byte> innerExceptionIdsSpan = stackalloc byte[GetArrayDataSize(InnerExceptionIds)];
+            FillArrayData(innerExceptionIdsSpan, InnerExceptionIds);
 
             SetValue(ref data[ExceptionEvents.ExceptionInstancePayloads.ExceptionId], ExceptionId);
+            SetValue(ref data[ExceptionEvents.ExceptionInstancePayloads.ExceptionGroupId], ExceptionGroupId);
             SetValue(ref data[ExceptionEvents.ExceptionInstancePayloads.ExceptionMessage], namePinned);
+            SetValue(ref data[ExceptionEvents.ExceptionInstancePayloads.StackFrameIds], stackFrameIdsSpan);
+            SetValue(ref data[ExceptionEvents.ExceptionInstancePayloads.Timestamp], Timestamp.ToFileTimeUtc());
+            SetValue(ref data[ExceptionEvents.ExceptionInstancePayloads.InnerExceptionIds], innerExceptionIdsSpan);
 
             WriteEventCore(ExceptionEvents.EventIds.ExceptionInstance, data);
 
@@ -111,19 +123,23 @@ public void FunctionDescription(
             uint ClassToken,
             ulong ModuleId,
             string Name,
-            ulong[] TypeArgs)
+            ulong[] TypeArgs,
+            ulong[] ParameterTypes)
         {
-            Span<EventData> data = stackalloc EventData[6];
+            Span<EventData> data = stackalloc EventData[7];
             using PinnedData namePinned = PinnedData.Create(Name);
             Span<byte> typeArgsSpan = stackalloc byte[GetArrayDataSize(TypeArgs)];
             FillArrayData(typeArgsSpan, TypeArgs);
+            Span<byte> parameterTypesSpan = stackalloc byte[GetArrayDataSize(ParameterTypes)];
+            FillArrayData(parameterTypesSpan, ParameterTypes);
 
             SetValue(ref data[NameIdentificationEvents.FunctionDescPayloads.FunctionId], FunctionId);
             SetValue(ref data[NameIdentificationEvents.FunctionDescPayloads.ClassId], ClassId);
             SetValue(ref data[NameIdentificationEvents.FunctionDescPayloads.ClassToken], ClassToken);
             SetValue(ref data[NameIdentificationEvents.FunctionDescPayloads.ModuleId], ModuleId);
             SetValue(ref data[NameIdentificationEvents.FunctionDescPayloads.Name], namePinned);
             SetValue(ref data[NameIdentificationEvents.FunctionDescPayloads.TypeArgs], typeArgsSpan);
+            SetValue(ref data[NameIdentificationEvents.FunctionDescPayloads.ParameterTypes], parameterTypesSpan);
 
             WriteEventCore(ExceptionEvents.EventIds.FunctionDescription, data);
 
@@ -146,6 +162,23 @@ public void ModuleDescription(
             RestartFlushingEventTimer();
         }
 
+        [Event(ExceptionEvents.EventIds.StackFrameDescription)]
+        public void StackFrameDescription(
+            ulong StackFrameId,
+            ulong FunctionId,
+            int ILOffset)
+        {
+            Span<EventData> data = stackalloc EventData[3];
+
+            SetValue(ref data[ExceptionEvents.StackFrameIdentifierPayloads.StackFrameId], StackFrameId);
+            SetValue(ref data[ExceptionEvents.StackFrameIdentifierPayloads.FunctionId], FunctionId);
+            SetValue(ref data[ExceptionEvents.StackFrameIdentifierPayloads.ILOffset], ILOffset);
+
+            WriteEventCore(ExceptionEvents.EventIds.StackFrameDescription, data);
+
+            RestartFlushingEventTimer();
+        }
+
         [Event(ExceptionEvents.EventIds.TokenDescription)]
         public void TokenDescription(
             ulong ModuleId,

src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Eventing/ExceptionsEventSourceIdentifierCacheCallback.cs

@@ -6,7 +6,7 @@
 namespace Microsoft.Diagnostics.Monitoring.StartupHook.Exceptions.Eventing
 {
     internal sealed class ExceptionsEventSourceIdentifierCacheCallback :
-        ExceptionIdentifierCacheCallback
+        ExceptionGroupIdentifierCacheCallback
     {
         private readonly ExceptionsEventSource _source;
 
@@ -25,10 +25,10 @@ public override void OnClassData(ulong classId, ClassData data)
                 data.TypeArgs);
         }
 
-        public override void OnExceptionIdentifier(ulong registrationId, ExceptionIdentifierData data)
+        public override void OnExceptionGroupData(ulong groupId, ExceptionGroupData data)
         {
-            _source.ExceptionIdentifier(
-                registrationId,
+            _source.ExceptionGroup(
+                groupId,
                 data.ExceptionClassId,
                 data.ThrowingMethodId,
                 data.ILOffset);
@@ -42,7 +42,8 @@ public override void OnFunctionData(ulong functionId, FunctionData data)
                 data.ParentToken,
                 data.ModuleId,
                 data.Name,
-                data.TypeArgs);
+                data.TypeArgs,
+                data.ParameterTypes);
         }
 
         public override void OnModuleData(ulong moduleId, ModuleData data)
@@ -52,6 +53,14 @@ public override void OnModuleData(ulong moduleId, ModuleData data)
                 data.Name);
         }
 
+        public override void OnStackFrameData(ulong frameId, StackFrameData data)
+        {
+            _source.StackFrameDescription(
+                frameId,
+                data.MethodId,
+                data.ILOffset);
+        }
+
         public override void OnTokenData(ulong moduleId, uint typeToken, TokenData data)
         {
             _source.TokenDescription(

src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/ExceptionEventArgs.cs

@@ -0,0 +1,20 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+
+namespace Microsoft.Diagnostics.Monitoring.StartupHook.Exceptions
+{
+    internal sealed class ExceptionEventArgs : EventArgs
+    {
+        public ExceptionEventArgs(Exception exception, DateTime timestamp)
+        {
+            Exception = exception;
+            Timestamp = timestamp;
+        }
+
+        public Exception Exception { get; }
+
+        public DateTime Timestamp { get; }
+    }
+}

src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/ExceptionSourceBase.cs

@@ -10,14 +10,14 @@ namespace Microsoft.Diagnostics.Monitoring.StartupHook.Exceptions
     /// </summary>
     internal abstract class ExceptionSourceBase
     {
-        protected void RaiseExceptionThrown(Exception ex)
+        protected void RaiseExceptionThrown(Exception ex, DateTime timestamp)
         {
-            ExceptionThrown?.Invoke(this, ex);
+            ExceptionThrown?.Invoke(this, new ExceptionEventArgs(ex, timestamp));
         }
 
         /// <summary>
         /// Event that is raised each time an exception is thrown.
         /// </summary>
-        public event EventHandler<Exception>? ExceptionThrown;
+        public event EventHandler<ExceptionEventArgs>? ExceptionThrown;
     }
 }

src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Identification/ExceptionIdentifierData.cs → src/Microsoft.Diagnostics.Monitoring.StartupHook/Exceptions/Identification/ExceptionGroupData.cs

@@ -3,7 +3,7 @@
 
 namespace Microsoft.Diagnostics.Monitoring.StartupHook.Exceptions.Identification
 {
-    internal sealed class ExceptionIdentifierData
+    internal sealed class ExceptionGroupData
     {
         public ulong ExceptionClassId { get; set; }
         public ulong ThrowingMethodId { get; set; }