From c3acca1d6c4e0163ca052bccb06463d848bda87c Mon Sep 17 00:00:00 2001
From: Simon Oakes <simonoakes@epimorphics.com>
Date: Mon, 8 Jun 2026 17:53:17 +0100
Subject: [PATCH] Enable MDC output in JSON logging format

---
 .../java/com/epimorphics/lda/support/LogRequestFilter.java   | 4 ++--
 pom.xml                                                      | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/elda-lda/src/main/java/com/epimorphics/lda/support/LogRequestFilter.java b/elda-lda/src/main/java/com/epimorphics/lda/support/LogRequestFilter.java
index 3fabaf006..6251dc870 100644
--- a/elda-lda/src/main/java/com/epimorphics/lda/support/LogRequestFilter.java
+++ b/elda-lda/src/main/java/com/epimorphics/lda/support/LogRequestFilter.java
@@ -86,7 +86,7 @@ public void init(FilterConfig filterConfig) throws ServletException {
             if (ID == null) ID = generateID(httpRequest);
 
             String fullID = ID.replace("*", seqId);
-            MDC.pushByKey("request_id", fullID);
+            MDC.put("request_id", fullID);
 
             log.info("Request {}", fullPath);
 
@@ -103,7 +103,7 @@ public void init(FilterConfig filterConfig) throws ServletException {
                     , NameUtils.formatDuration(endTime - startTime)
             );
 
-            MDC.popByKey("request_id");
+            MDC.remove("request_id");
         }
     }
 
diff --git a/pom.xml b/pom.xml
index 22409523d..d6494e0e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,6 +157,11 @@
       <artifactId>logback-classic</artifactId>
       <version>1.5.20</version>
     </dependency>
+    <dependency>
+      <groupId>net.logstash.logback</groupId>
+      <artifactId>logstash-logback-encoder</artifactId>
+      <version>9.0</version>
+    </dependency>
 
     <dependency>
       <groupId>jakarta.servlet</groupId>