From b0aa16269989dc2d86e134bc5339d8a461943503 Mon Sep 17 00:00:00 2001
From: Anders Abel <anders@duendesoftware.com>
Date: Sat, 16 Dec 2023 22:54:13 +0100
Subject: [PATCH] Include Activity Id in ErrorMessage

---
 src/IdentityServer/Endpoints/Results/AuthorizeResult.cs | 1 +
 src/IdentityServer/Events/Infrastructure/Event.cs       | 5 +++--
 src/IdentityServer/Models/Messages/ErrorMessage.cs      | 8 ++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/IdentityServer/Endpoints/Results/AuthorizeResult.cs b/src/IdentityServer/Endpoints/Results/AuthorizeResult.cs
index 5b014e017..7dc30aefa 100644
--- a/src/IdentityServer/Endpoints/Results/AuthorizeResult.cs
+++ b/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,
diff --git a/src/IdentityServer/Events/Infrastructure/Event.cs b/src/IdentityServer/Events/Infrastructure/Event.cs
index 813de93cf..5a44448f4 100644
--- a/src/IdentityServer/Events/Infrastructure/Event.cs
+++ b/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>
diff --git a/src/IdentityServer/Models/Messages/ErrorMessage.cs b/src/IdentityServer/Models/Messages/ErrorMessage.cs
index fa78eb119..793a4af82 100644
--- a/src/IdentityServer/Models/Messages/ErrorMessage.cs
+++ b/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>