From 7ad1023200035ca97122fead306972c27efec180 Mon Sep 17 00:00:00 2001
From: Simon Oakes <simonoakes@epimorphics.com>
Date: Thu, 23 Jul 2026 13:15:49 +0100
Subject: [PATCH 1/3] Remove automatic generation of request ID

---
 .../java/com/epimorphics/lda/Version.java     |  2 +-
 .../lda/support/LogRequestFilter.java         | 21 +++++++------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/elda-lda/src/main/java/com/epimorphics/lda/Version.java b/elda-lda/src/main/java/com/epimorphics/lda/Version.java
index 801f7f425..ca2e433ef 100644
--- a/elda-lda/src/main/java/com/epimorphics/lda/Version.java
+++ b/elda-lda/src/main/java/com/epimorphics/lda/Version.java
@@ -17,5 +17,5 @@
  *
  */
 public interface Version {
-    public final String string = "3.0.2-SNAPSHOT";
+    public final String string = "3.0.2";
 }
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 6251dc870..8a40973da 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
@@ -83,15 +83,14 @@ public void init(FilterConfig filterConfig) throws ServletException {
                 if (ID == null) ID = paramID;
                 if (ID == null) ID = headerID;
             }
-            if (ID == null) ID = generateID(httpRequest);
 
-            String fullID = ID.replace("*", seqId);
-            MDC.put("request_id", fullID);
+            if (ID != null) {
+                String fullID = ID.replace("*", seqId);
+                MDC.put("request_id", fullID);
+                httpResponse.addHeader(X_RESPONSE_ID, fullID);
+            }
 
             log.info("Request {}", fullPath);
-
-            httpResponse.addHeader(X_RESPONSE_ID, fullID);
-
             long startTime = System.currentTimeMillis();
             chain.doFilter(request, response);
             long endTime = System.currentTimeMillis();
@@ -103,16 +102,12 @@ public void init(FilterConfig filterConfig) throws ServletException {
                     , NameUtils.formatDuration(endTime - startTime)
             );
 
-            MDC.remove("request_id");
+            if (ID != null) {
+                MDC.remove("request_id");
+            }
         }
     }
 
-    private String generateID(HttpServletRequest req) {
-        // return UUID_V1.generate().toString();
-        String envID = System.getenv("ELDA_INSTANCE_ID");
-        return envID == null ? "host " + req.getLocalAddr() + ":*" : envID;
-    }
-
     // The check for NoSuchMethodError is because Tomcat6 doesn't have a
     // getStatus() in its HttpServletResponse implementation, and we have
     // users still on Tomcat 6. -1 is a "no not really" value.

From d2fb5c6c5ed5bf78d1491d0282942f7953603c63 Mon Sep 17 00:00:00 2001
From: Simon <37299842+simonoakesepimorphics@users.noreply.github.com>
Date: Thu, 23 Jul 2026 14:45:09 +0100
Subject: [PATCH 2/3] Remove request ID manipulation

---
 .../java/com/epimorphics/lda/support/LogRequestFilter.java    | 4 ----
 1 file changed, 4 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 8a40973da..408633fb4 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
@@ -76,16 +76,12 @@ public void init(FilterConfig filterConfig) throws ServletException {
             String headerID = httpRequest.getHeader(X_REQUEST_ID);
             String paramID = httpRequest.getParameter(QueryParameter._QUERY_ID);
 
-            long requestCount = queryCount.incrementAndGet();
-            String seqId = Long.toString(requestCount);
-
             if (useID) {
                 if (ID == null) ID = paramID;
                 if (ID == null) ID = headerID;
             }
 
             if (ID != null) {
-                String fullID = ID.replace("*", seqId);
                 MDC.put("request_id", fullID);
                 httpResponse.addHeader(X_RESPONSE_ID, fullID);
             }

From e8cf418007de91d77d60ae04040fe3aef55a1c3a Mon Sep 17 00:00:00 2001
From: Simon <37299842+simonoakesepimorphics@users.noreply.github.com>
Date: Thu, 23 Jul 2026 14:47:26 +0100
Subject: [PATCH 3/3] Update LogRequestFilter.java

---
 .../java/com/epimorphics/lda/support/LogRequestFilter.java    | 4 ++--
 1 file changed, 2 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 408633fb4..ae1df31d7 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
@@ -82,8 +82,8 @@ public void init(FilterConfig filterConfig) throws ServletException {
             }
 
             if (ID != null) {
-                MDC.put("request_id", fullID);
-                httpResponse.addHeader(X_RESPONSE_ID, fullID);
+                MDC.put("request_id", ID);
+                httpResponse.addHeader(X_RESPONSE_ID, ID);
             }
 
             log.info("Request {}", fullPath);