diff --git a/pom.xml b/pom.xml index 2e163b5b..cafe818a 100644 --- a/pom.xml +++ b/pom.xml @@ -3,13 +3,14 @@ 4.0.0 no.obos.util servicebuilder - 10.1.14 + 10.1.15 pom + no.obos.common obos-common-pom - 10.1.14 + 10.1.15 diff --git a/servicebuilder-activemq/pom.xml b/servicebuilder-activemq/pom.xml index 95c7f6e2..38640e09 100644 --- a/servicebuilder-activemq/pom.xml +++ b/servicebuilder-activemq/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.1.15 diff --git a/servicebuilder-addons/pom.xml b/servicebuilder-addons/pom.xml index 45d60159..199857a1 100644 --- a/servicebuilder-addons/pom.xml +++ b/servicebuilder-addons/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.1.15 diff --git a/servicebuilder-core-addons/pom.xml b/servicebuilder-core-addons/pom.xml index 73bd27c8..d4c66867 100644 --- a/servicebuilder-core-addons/pom.xml +++ b/servicebuilder-core-addons/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.1.15 diff --git a/servicebuilder-core-test/pom.xml b/servicebuilder-core-test/pom.xml index e305522e..d7e17b70 100644 --- a/servicebuilder-core-test/pom.xml +++ b/servicebuilder-core-test/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.1.15 diff --git a/servicebuilder-core/pom.xml b/servicebuilder-core/pom.xml index 8b7f5cef..d5fcb594 100644 --- a/servicebuilder-core/pom.xml +++ b/servicebuilder-core/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.1.15 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 index bf006bb6..d6b3fe0b 100644 --- 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 index 2d66fa39..777ca221 100644 --- a/servicebuilder-db-basicdatasource/pom.xml +++ b/servicebuilder-db-basicdatasource/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.1.15 diff --git a/servicebuilder-db-h2/pom.xml b/servicebuilder-db-h2/pom.xml index 6a0d345b..ee027541 100644 --- a/servicebuilder-db-h2/pom.xml +++ b/servicebuilder-db-h2/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.1.15 diff --git a/servicebuilder-db-jdbi/pom.xml b/servicebuilder-db-jdbi/pom.xml index 39545249..4c89815e 100644 --- a/servicebuilder-db-jdbi/pom.xml +++ b/servicebuilder-db-jdbi/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.1.15 diff --git a/servicebuilder-db-queryrunner/pom.xml b/servicebuilder-db-queryrunner/pom.xml index 8d27110f..e70d0d76 100644 --- a/servicebuilder-db-queryrunner/pom.xml +++ b/servicebuilder-db-queryrunner/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.1.15 diff --git a/servicebuilder-db/pom.xml b/servicebuilder-db/pom.xml index 42548c2f..2cbb122d 100644 --- a/servicebuilder-db/pom.xml +++ b/servicebuilder-db/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.1.15 diff --git a/servicebuilder-elasticsearch-mock/pom.xml b/servicebuilder-elasticsearch-mock/pom.xml index 5c761385..08586167 100644 --- a/servicebuilder-elasticsearch-mock/pom.xml +++ b/servicebuilder-elasticsearch-mock/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.1.15 4.0.0 diff --git a/servicebuilder-elasticsearch/pom.xml b/servicebuilder-elasticsearch/pom.xml index b563239f..183748d1 100644 --- a/servicebuilder-elasticsearch/pom.xml +++ b/servicebuilder-elasticsearch/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.1.15 4.0.0 diff --git a/servicebuilder-iam/pom.xml b/servicebuilder-iam/pom.xml index 4c3c57a3..352ea68e 100644 --- a/servicebuilder-iam/pom.xml +++ b/servicebuilder-iam/pom.xml @@ -6,7 +6,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.1.15 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 index bfabd708..0db676f9 100644 --- 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 index 6dc2765d..2081e1bb 100644 --- a/servicebuilder-interfaces/pom.xml +++ b/servicebuilder-interfaces/pom.xml @@ -5,7 +5,7 @@ no.obos.util servicebuilder - 10.1.14 + 10.1.15 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 index 129ea0bc..76707dd8 100644 --- 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";