[FKJ-900] Set new correlationId header (#5)

Sti2nd · web-flow · commit 546db274fae0 · 2023-03-31T09:38:52.000+02:00
[FKJ-900](https://obos-bbl.atlassian.net/browse/FKJ-900)
diff --git a/pom.xml b/pom.xml
@@ -3,13 +3,14 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>no.obos.util</groupId>
     <artifactId>servicebuilder</artifactId>
-    <version>10.1.14</version>
+    <version>10.1.15</version>
     <packaging>pom</packaging>
 
     <parent>
+        <!-- https://github.com/code-obos/obos-common-pom -->
         <groupId>no.obos.common</groupId>
         <artifactId>obos-common-pom</artifactId>
-        <version>10.1.14</version>
+        <version>10.1.15</version>
     </parent>
 
     <prerequisites>
diff --git a/servicebuilder-activemq/pom.xml b/servicebuilder-activemq/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>no.obos.util</groupId>
         <artifactId>servicebuilder</artifactId>
-         <version>10.1.14</version>
+         <version>10.1.15</version>
     </parent>
 
     <dependencies>
diff --git a/servicebuilder-addons/pom.xml b/servicebuilder-addons/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>no.obos.util</groupId>
         <artifactId>servicebuilder</artifactId>
-         <version>10.1.14</version>
+         <version>10.1.15</version>
     </parent>
 
     <dependencies>
diff --git a/servicebuilder-core-addons/pom.xml b/servicebuilder-core-addons/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>no.obos.util</groupId>
         <artifactId>servicebuilder</artifactId>
-         <version>10.1.14</version>
+         <version>10.1.15</version>
     </parent>
 
     <dependencies>
diff --git a/servicebuilder-core-test/pom.xml b/servicebuilder-core-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>no.obos.util</groupId>
         <artifactId>servicebuilder</artifactId>
-         <version>10.1.14</version>
+         <version>10.1.15</version>
     </parent>
 
     <dependencies>
diff --git a/servicebuilder-core/pom.xml b/servicebuilder-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>no.obos.util</groupId>
         <artifactId>servicebuilder</artifactId>
-         <version>10.1.14</version>
+         <version>10.1.15</version>
     </parent>
 
     <dependencies>
diff --git a/servicebuilder-core/src/main/java/no/obos/util/servicebuilder/client/RequestIdClientFilter.java b/servicebuilder-core/src/main/java/no/obos/util/servicebuilder/client/RequestIdClientFilter.java
@@ -16,6 +16,7 @@ public void filter(ClientRequestContext requestContext) throws IOException {
         String requestId = MDC.get(Constants.X_OBOS_REQUEST_ID);
         if (requestId != null) {
             requestContext.getHeaders().putSingle(Constants.X_OBOS_REQUEST_ID, requestId);
+            requestContext.getHeaders().putSingle(Constants.CORRELATION_ID, requestId);
         }
     }
 }
diff --git a/servicebuilder-db-basicdatasource/pom.xml b/servicebuilder-db-basicdatasource/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>no.obos.util</groupId>
         <artifactId>servicebuilder</artifactId>
-        <version>10.1.14</version>
+        <version>10.1.15</version>
     </parent>
 
     <dependencies>
diff --git a/servicebuilder-db-h2/pom.xml b/servicebuilder-db-h2/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>no.obos.util</groupId>
         <artifactId>servicebuilder</artifactId>
-        <version>10.1.14</version>
+        <version>10.1.15</version>
     </parent>
 
     <dependencies>
diff --git a/servicebuilder-db-jdbi/pom.xml b/servicebuilder-db-jdbi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>no.obos.util</groupId>
         <artifactId>servicebuilder</artifactId>
-        <version>10.1.14</version>
+        <version>10.1.15</version>
     </parent>
 
     <dependencies>
diff --git a/servicebuilder-db-queryrunner/pom.xml b/servicebuilder-db-queryrunner/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>no.obos.util</groupId>
         <artifactId>servicebuilder</artifactId>
-        <version>10.1.14</version>
+        <version>10.1.15</version>
     </parent>
 
     <dependencies>
diff --git a/servicebuilder-db/pom.xml b/servicebuilder-db/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>no.obos.util</groupId>
         <artifactId>servicebuilder</artifactId>
-        <version>10.1.14</version>
+        <version>10.1.15</version>
     </parent>
 
     <dependencies>
diff --git a/servicebuilder-elasticsearch-mock/pom.xml b/servicebuilder-elasticsearch-mock/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>no.obos.util</groupId>
         <artifactId>servicebuilder</artifactId>
-        <version>10.1.14</version>
+        <version>10.1.15</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/servicebuilder-elasticsearch/pom.xml b/servicebuilder-elasticsearch/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>no.obos.util</groupId>
         <artifactId>servicebuilder</artifactId>
-        <version>10.1.14</version>
+        <version>10.1.15</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/servicebuilder-iam/pom.xml b/servicebuilder-iam/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>no.obos.util</groupId>
         <artifactId>servicebuilder</artifactId>
-        <version>10.1.14</version>
+        <version>10.1.15</version>
     </parent>
 
     <dependencies>
diff --git a/servicebuilder-iam/src/test/java/no/obos/util/servicebuilder/client/JerseyClientAddonTest.java b/servicebuilder-iam/src/test/java/no/obos/util/servicebuilder/client/JerseyClientAddonTest.java
@@ -158,6 +158,7 @@ public void request_id_gets_carried_over() {
         TestServiceFull.Call expected = getCall()
                 .toBuilder()
                 .header(Constants.X_OBOS_REQUEST_ID, "Banana")
+                .header(Constants.CORRELATION_ID, "Banana")
                 .build();
         TestServiceRunner.Runtime nestedRuntime = nestedService.start().runtime;
 
diff --git a/servicebuilder-interfaces/pom.xml b/servicebuilder-interfaces/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>no.obos.util</groupId>
         <artifactId>servicebuilder</artifactId>
-        <version>10.1.14</version>
+        <version>10.1.15</version>
     </parent>
 
     <dependencies>
diff --git a/servicebuilder-interfaces/src/main/java/no/obos/util/servicebuilder/model/Constants.java b/servicebuilder-interfaces/src/main/java/no/obos/util/servicebuilder/model/Constants.java
@@ -5,6 +5,7 @@ public final class Constants {
     public static final String CLIENT_APPNAME_HEADER = "X-OBOS-CLIENT-APPNAME";
     public static final String USERTOKENID_HEADER = "X-OBOS-USERTOKENID";
     public static final String X_OBOS_REQUEST_ID = "X-OBOS-REQUEST-ID";
+    public static final String CORRELATION_ID = "correlationId";
     public static final String APPCONFIG_KEY = "SERVICE_CONFIG";
     public static final String CONFIG_KEY_SERVICE_VERSION = "service.version";
     public static final String CONFIG_KEY_SERVICE_VERSION_MAJOR = "service.version.major";

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ public void filter(ClientRequestContext requestContext) throws IOException {`
`16`	`16`	`String requestId = MDC.get(Constants.X_OBOS_REQUEST_ID);`
`17`	`17`	`if (requestId != null) {`
`18`	`18`	`requestContext.getHeaders().putSingle(Constants.X_OBOS_REQUEST_ID, requestId);`
	`19`	`+ requestContext.getHeaders().putSingle(Constants.CORRELATION_ID, requestId);`
`19`	`20`	`}`
`20`	`21`	`}`
`21`	`22`	`}`