Merge pull request #1494 from DuendeSoftware/anders/1478_ActivityId

Include Activity Id in ErrorMessage

src/IdentityServer/Endpoints/Results/AuthorizeResult.cs

@@ -222,6 +222,7 @@ private async Task RedirectToErrorPageAsync(AuthorizeResponse response, HttpCont
     {
         var errorModel = new ErrorMessage
         {
+            ActivityId = System.Diagnostics.Activity.Current?.Id,
             RequestId = context.TraceIdentifier,
             Error = response.Error,
             ErrorDescription = response.ErrorDescription,

src/IdentityServer/Events/Infrastructure/Event.cs

@@ -85,11 +85,12 @@ protected internal virtual Task PrepareAsync()
     public string? Message { get; set; }
 
     /// <summary>
-    /// Gets or sets the per-request activity identifier.
+    /// Gets or sets the per-request trace identifier (not the Activity Id)
     /// </summary>
     /// <value>
-    /// The activity identifier.
+    /// The HttpContext.TraceIdentifier.
     /// </value>
+    /// <remarks>Note that this is not the Activity Id despite the name.</remarks>
     public string? ActivityId { get; set; }
 
     /// <summary>

src/IdentityServer/Models/Messages/ErrorMessage.cs

@@ -51,6 +51,14 @@ public class ErrorMessage
     /// </value>
     public string? RequestId { get; set; }
 
+    /// <summary>
+    /// The current Activity Id when the error message was captured.
+    /// </summary>
+    /// <value>
+    /// The Activity Identifier
+    /// </value>
+    public string? ActivityId { get; set; }
+
     /// <summary>
     /// The redirect URI.
     /// </summary>