From 29f39c9602666bb0c2d06c343c5d20d9bebb3600 Mon Sep 17 00:00:00 2001
From: jonanderssol <jon.anders.sollien@entur.org>
Date: Thu, 20 Nov 2025 10:25:53 +0100
Subject: [PATCH] ETU-65064: Adds support for log prefix

---
 .../logbook/properties/MessageFormatProperties.java  | 12 +++++++++++-
 .../entur/logging/cloud/logbook/MessageComposer.java |  7 ++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/request-response/logbook-spring-boot-autoconfigure/src/main/java/no/entur/logging/cloud/spring/logbook/properties/MessageFormatProperties.java b/request-response/logbook-spring-boot-autoconfigure/src/main/java/no/entur/logging/cloud/spring/logbook/properties/MessageFormatProperties.java
index e0c7bedc..d033c367 100644
--- a/request-response/logbook-spring-boot-autoconfigure/src/main/java/no/entur/logging/cloud/spring/logbook/properties/MessageFormatProperties.java
+++ b/request-response/logbook-spring-boot-autoconfigure/src/main/java/no/entur/logging/cloud/spring/logbook/properties/MessageFormatProperties.java
@@ -4,6 +4,8 @@
 
 public class MessageFormatProperties {
 
+    /** Custom prefix */
+    protected String prefix = null;
     /** Include URI protocol / scheme */
     protected boolean scheme = true;
     /** Include URI host */
@@ -15,6 +17,14 @@ public class MessageFormatProperties {
     /** Include URI query */
     protected boolean query = true;
 
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public void setPrefix(String prefix) {
+        this.prefix = prefix;
+    }
+
     public boolean isScheme() {
         return scheme;
     }
@@ -56,6 +66,6 @@ public void setQuery(boolean query) {
     }
 
     public MessageComposer toComposer() {
-        return new MessageComposer(scheme, host, port, path, query);
+        return new MessageComposer(prefix, scheme, host, port, path, query);
     }
 }
diff --git a/request-response/logbook/src/main/java/no/entur/logging/cloud/logbook/MessageComposer.java b/request-response/logbook/src/main/java/no/entur/logging/cloud/logbook/MessageComposer.java
index 05b1f392..6cbf6da5 100644
--- a/request-response/logbook/src/main/java/no/entur/logging/cloud/logbook/MessageComposer.java
+++ b/request-response/logbook/src/main/java/no/entur/logging/cloud/logbook/MessageComposer.java
@@ -16,13 +16,15 @@
 
 public class MessageComposer {
 
+    protected String prefix;
     protected boolean scheme;
     protected boolean host;
     protected boolean port;
     protected boolean path;
     protected boolean query;
 
-    public MessageComposer(boolean scheme, boolean host, boolean port, boolean path, boolean query) {
+    public MessageComposer(String prefix, boolean scheme, boolean host, boolean port, boolean path, boolean query) {
+        this.prefix = prefix;
         this.scheme = scheme;
         this.host = host;
         this.port = port;
@@ -36,6 +38,9 @@ static boolean isNotStandardPort(final String scheme, final int port) {
     }
 
     protected void constructMessage(HttpRequest request, StringBuilder messageBuilder) throws IOException {
+        if (prefix != null) {
+            messageBuilder.append(prefix);
+        }
         if (scheme) {
             String schemeValue = request.getScheme();
             if(schemeValue != null && !schemeValue.isEmpty()) {