Skip to content

[FKJ-900] Set new correlationId header #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Sti2nd merged 6 commits into from
Mar 31, 2023
Merged

[FKJ-900] Set new correlationId header #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2afd12f
[FKJ-899] Set new correlationId header
Sti2nd Mar 28, 2023
0e83bba
correct SNAPSHOT
Sti2nd Mar 29, 2023
a04144e
[VERSION] 10.1.15
Sti2nd Mar 29, 2023
3e9ae96
Forth and back
Sti2nd Mar 29, 2023
30ec661
Revert "Forth and back"
Sti2nd Mar 29, 2023
5cd5134
Fix test
Sti2nd Mar 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion servicebuilder-activemq/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion servicebuilder-addons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion servicebuilder-core-addons/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion servicebuilder-core-test/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion servicebuilder-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions ...ebuilder-core/src/main/java/no/obos/util/servicebuilder/client/RequestIdClientFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
2 changes: 1 addition & 1 deletion servicebuilder-db-basicdatasource/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion servicebuilder-db-h2/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion servicebuilder-db-jdbi/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion servicebuilder-db-queryrunner/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion servicebuilder-db/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion servicebuilder-elasticsearch-mock/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion servicebuilder-elasticsearch/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion servicebuilder-iam/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions ...cebuilder-iam/src/test/java/no/obos/util/servicebuilder/client/JerseyClientAddonTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion servicebuilder-interfaces/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions servicebuilder-interfaces/src/main/java/no/obos/util/servicebuilder/model/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down