SCMOD-12257: Correlation Id Support by simranjeetc · Pull Request #18 · CAFapi/caf-logging

simranjeetc · 2021-01-27T06:47:30Z

https://portal.digitalsafe.net/browse/SCMOD-12257

…for logging correlation id

buildmachine-sou-jenkins2 · 2021-01-27T06:50:03Z

CI Build Link:
http://sou-jenkins2.swinfra.net:8080/job/CAFapi/job/CAFapi~caf-logging~SCMOD-12257~CI

simranjeetc · 2021-02-03T10:55:33Z

@dermot-hardy
I have opened this PR for review. Once it is merged, I will update the jar version in the pom files for all the services which are using this library. Until then, I will leave the others as draft only.

pom.xml

caf-correlation-id/pom.xml

...rrelation-id/src/main/java/com/github/cafapi/http/interceptors/CorrelationIdInterceptor.java

caf-correlation-id/src/test/java/com/filter/http/spring/TestingWebApplicationTests.java

caf-correlation-id/src/test/java/com/filter/http/dropwizard/CorrelationIdDropwizardTest.java

...n/java/com/github/cafapi/http/filters/correlationid/CorrelationIdConfigurationConstants.java

dermot-hardy

The duplicate-finder-maven-plugin is reporting lots of warnings:

2021-02-03T07:06:12.933663288Z [INFO] --- duplicate-finder-maven-plugin:1.3.0:check (deepcheck-dependencies) @ caf-correlation-id ---
2021-02-03T07:06:12.935268289Z [INFO] Checking compile classpath
2021-02-03T07:06:13.731032292Z [INFO] Checking runtime classpath
2021-02-03T07:06:13.735996134Z [INFO] Checking test classpath
...
2021-02-03T07:06:14.695631150Z [WARNING] Found duplicate and different classes in [org.apache.tomcat.embed:tomcat-embed-el:9.0.33, org.glassfish:jakarta.el:3.0.3]:
2021-02-03T07:06:14.695639853Z [WARNING]   javax.el.ArrayELResolver
2021-02-03T07:06:14.695664629Z [WARNING]   javax.el.BeanELResolver
2021-02-03T07:06:14.696733828Z [WARNING]   javax.el.BeanNameELResolver
2021-02-03T07:06:14.696758507Z [WARNING]   javax.el.BeanNameResolver
2021-02-03T07:06:14.696767390Z [WARNING]   javax.el.CompositeELResolver
...
2021-02-03T07:06:14.708697867Z [WARNING]   javax/servlet/http/LocalStrings.properties

...n-id-spring/src/main/java/com/github/cafapi/correlation/spring/CorrelationIdInterceptor.java

Deployment is disabled for it and the last project is responsible for deploying all of the project's artifacts.

dermot-hardy

Looking at these changes now I think it makes more sense to have them to a separate repository.
I've created https://github.com/CAFapi/caf-correlation for this. We can check them in here for now if you want so long as we move them before the next release. Moving them will involve resetting the version number back from 1.4.0-SNAPSHOT to 1.0.0-SNAPSHOT so it probably makes more sense to do it sooner rather than later.

As far as I can see the main thing missing here now is documentation. These modules require a write-up to explain what they are and how they should be used.

…g it from here.

simranjeetc · 2021-02-11T04:57:00Z

Looking at these changes now I think it makes more sense to have them to a separate repository.
I've created https://github.com/CAFapi/caf-correlation for this. We can check them in here for now if you want so long as we move them before the next release. Moving them will involve resetting the version number back from 1.4.0-SNAPSHOT to 1.0.0-SNAPSHOT so it probably makes more sense to do it sooner rather than later.

As far as I can see the main thing missing here now is documentation. These modules require a write-up to explain what they are and how they should be used.

/home/simran/.jdks/adopt-openjdk-1.8.0_275/bin/java -Dmaven.multiModuleProjectDirectory=/media/D/codebase/CAFapi/caf-correlation -Dmaven.home=/opt/apache-maven-3.6.2 -Dclassworlds.conf=/opt/apache-maven-3.6.2/bin/m2.conf -Dmaven.ext.class.path=/media/D/softwares/jetbrains-tools-installation/apps/IDEA-U/ch-0/202.8194.7/plugins/maven/lib/maven-event-listener.jar -javaagent:/media/D/softwares/jetbrains-tools-installation/apps/IDEA-U/ch-0/202.8194.7/lib/idea_rt.jar=44829:/media/D/softwares/jetbrains-tools-installation/apps/IDEA-U/ch-0/202.8194.7/bin -Dfile.encoding=UTF-8 -classpath /opt/apache-maven-3.6.2/boot/plexus-classworlds-2.6.0.jar org.codehaus.classworlds.Launcher -Didea.version=2020.2.4 -s /opt/apache-maven-3.6.2/conf/settings.xml org.basepom.maven:duplicate-finder-maven-plugin:1.5.0:check
[INFO] Scanning for projects...
[INFO] Inspecting build with total of 7 modules...
[INFO] Installing Nexus Staging features:
[INFO] ... total of 7 executions of maven-deploy-plugin replaced with nexus-staging-maven-plugin
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Build Order:
[INFO]
[INFO] caf-correlation [pom]
[INFO] caf-correlation-constants [jar]
[INFO] caf-correlation-jaxrs [jar]
[INFO] caf-correlation-jservlet [jar]
[INFO] caf-correlation-spring [jar]
[INFO] caf-correlation-spring-tests [jar]
[INFO] caf-correlation-dropwizard [jar]
[INFO]
[INFO] -----------< com.github.cafapi.correlation:caf-correlation >------------
[INFO] Building caf-correlation 1.0.0-SNAPSHOT [1/7]
[INFO] --------------------------------[ pom ]---------------------------------
[INFO]
[INFO] --- duplicate-finder-maven-plugin:1.5.0:check (default-cli) @ caf-correlation ---
[INFO] Ignoring POM project!
[INFO]
[INFO] ------< com.github.cafapi.correlation:caf-correlation-constants >-------
[INFO] Building caf-correlation-constants 1.0.0-SNAPSHOT [2/7]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO]
[INFO] --- duplicate-finder-maven-plugin:1.5.0:check (default-cli) @ caf-correlation-constants ---
[INFO] Checking compile classpath
[INFO] Checking runtime classpath
[INFO] Checking test classpath
[INFO]
[INFO] --------< com.github.cafapi.correlation:caf-correlation-jaxrs >---------
[INFO] Building caf-correlation-jaxrs 1.0.0-SNAPSHOT [3/7]
[INFO] --------------------------------[ jar ]---------------------------------
Downloading from company-central: https://svsartifactory.swinfra.net/artifactory/company-central/com/github/cafapi/correlation/caf-correlation-constants/1.0.0-SNAPSHOT/maven-metadata.xml
[INFO]
[INFO] --- duplicate-finder-maven-plugin:1.5.0:check (default-cli) @ caf-correlation-jaxrs ---
[INFO] Checking compile classpath
[INFO] Checking runtime classpath
[INFO] Checking test classpath
[INFO]
[INFO] -------< com.github.cafapi.correlation:caf-correlation-jservlet >-------
[INFO] Building caf-correlation-jservlet 1.0.0-SNAPSHOT [4/7]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO]
[INFO] --- duplicate-finder-maven-plugin:1.5.0:check (default-cli) @ caf-correlation-jservlet ---
[INFO] Checking compile classpath
[INFO] Checking runtime classpath
[INFO] Checking test classpath
[INFO]
[INFO] --------< com.github.cafapi.correlation:caf-correlation-spring >--------
[INFO] Building caf-correlation-spring 1.0.0-SNAPSHOT [5/7]
[INFO] --------------------------------[ jar ]---------------------------------
[INFO]
[INFO] --- duplicate-finder-maven-plugin:1.5.0:check (default-cli) @ caf-correlation-spring ---
[INFO] Checking compile classpath
[INFO] Checking runtime classpath
[INFO] Checking test classpath
[INFO]
[INFO] -----< com.github.cafapi.correlation:caf-correlation-spring-tests >-----
[INFO] Building caf-correlation-spring-tests 1.0.0-SNAPSHOT [6/7]
[INFO] --------------------------------[ jar ]---------------------------------
Downloading from company-central: https://svsartifactory.swinfra.net/artifactory/company-central/com/github/cafapi/correlation/caf-correlation-jaxrs/1.0.0-SNAPSHOT/maven-metadata.xml
Downloading from company-central: https://svsartifactory.swinfra.net/artifactory/company-central/com/github/cafapi/correlation/caf-correlation-spring/1.0.0-SNAPSHOT/maven-metadata.xml
[INFO]
[INFO] --- duplicate-finder-maven-plugin:1.5.0:check (default-cli) @ caf-correlation-spring-tests ---
[INFO] Checking compile classpath
[INFO] Checking runtime classpath
[INFO] Checking test classpath
[INFO]
[INFO] ------< com.github.cafapi.correlation:caf-correlation-dropwizard >------
[INFO] Building caf-correlation-dropwizard 1.0.0-SNAPSHOT [7/7]
[INFO] --------------------------------[ jar ]---------------------------------
Downloading from company-central: https://svsartifactory.swinfra.net/artifactory/company-central/com/github/cafapi/correlation/caf-correlation-jservlet/1.0.0-SNAPSHOT/maven-metadata.xml
[INFO]
[INFO] --- duplicate-finder-maven-plugin:1.5.0:check (default-cli) @ caf-correlation-dropwizard ---
[INFO] Checking compile classpath
[INFO] Checking runtime classpath
[INFO] Checking test classpath
[INFO] ------------------------------------------------------------------------
[INFO] Reactor Summary for caf-correlation 1.0.0-SNAPSHOT:
[INFO]
[INFO] caf-correlation .................................... SUCCESS [ 0.401 s]
[INFO] caf-correlation-constants .......................... SUCCESS [ 0.207 s]
[INFO] caf-correlation-jaxrs .............................. SUCCESS [ 8.673 s]
[INFO] caf-correlation-jservlet ........................... SUCCESS [ 0.060 s]
[INFO] caf-correlation-spring ............................. SUCCESS [ 0.420 s]
[INFO] caf-correlation-spring-tests ....................... SUCCESS [ 13.949 s]
[INFO] caf-correlation-dropwizard ......................... SUCCESS [ 8.457 s]
[INFO] ------------------------------------------------------------------------
[INFO] BUILD SUCCESS
[INFO] ------------------------------------------------------------------------
[INFO] Total time: 33.598 s
[INFO] Finished at: 2021-02-11T10:23:04+05:30
[INFO] ------------------------------------------------------------------------

Not getting duplicates with latest changes.

simranjeetc · 2021-02-11T05:28:02Z

Closing this PR as we moved this code to a new repository CAFapi/caf-correlation#1

Simranjeet Singh Chawla added 3 commits January 25, 2021 17:27

Creating a library to include dropwizard bundle & sprint boot filter …

04efd17

…for logging correlation id

Updated package name

6c590fd

Updated the header key for correlation Id

9b2c4dd

simranjeetc requested a review from dermot-hardy January 27, 2021 06:47

buildmachine-sou-jenkins2 added the delete-build-on-pr-close label Jan 27, 2021

Simranjeet Singh Chawla added 5 commits January 28, 2021 12:10

Changed the scope of servlet jars to provided

c30f864

Added correlation id support for spring boot interceptors

de2ad7e

Removed dependency on spring-core

66e114a

Changed scope of dropwizard dependencies to provided.

ab43b42

Added ITs

5e4677d

simranjeetc marked this pull request as ready for review February 3, 2021 10:22

simranjeetc assigned dermot-hardy Feb 4, 2021

dermot-hardy changed the title ~~Scmod 12257~~ SCMOD-12257: Correlation Id Support Feb 9, 2021

dermot-hardy requested changes Feb 9, 2021

View reviewed changes

dermot-hardy added 8 commits February 9, 2021 02:19

Fix generics issues in tests

ce9a0cc

Split the project into separate modules

9a26ccd

Updated the copyright headers

625e277

Updated constants to standard convention

c51b436

Moved the classes to module-aligned packages

3877191

Whitespace changes: Source --> Format

f35ad8f

Added missing final keywords

fefceb1

Disallow instantiating the constants module

66ebc1c

dermot-hardy reviewed Feb 9, 2021

View reviewed changes

...n-id-spring/src/main/java/com/github/cafapi/correlation/spring/CorrelationIdInterceptor.java Outdated Show resolved Hide resolved

Updated to avoid spring-tests being the last project

f107004

Deployment is disabled for it and the last project is responsible for deploying all of the project's artifacts.

dermot-hardy approved these changes Feb 9, 2021

View reviewed changes

Added provided scope rs-api

83b9517

Simranjeet Singh Chawla added 2 commits February 10, 2021 11:28

Removed "-id" from module name and artifact ids

1d5a6e5

Moved caf-correlation module to a separate repository. Hence, removin…

e0fde35

…g it from here.

simranjeetc closed this Feb 11, 2021

buildmachine-sou-jenkins2 removed the delete-build-on-pr-close label Feb 11, 2021

dermot-hardy deleted the SCMOD-12257 branch February 11, 2021 22:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

SCMOD-12257: Correlation Id Support#18

SCMOD-12257: Correlation Id Support#18
simranjeetc wants to merge 20 commits intomasterfrom
SCMOD-12257

simranjeetc commented Jan 27, 2021 •

edited by dermot-hardy

Loading

Uh oh!

buildmachine-sou-jenkins2 commented Jan 27, 2021

Uh oh!

simranjeetc commented Feb 3, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dermot-hardy left a comment •

edited

Loading

Uh oh!

Uh oh!

dermot-hardy left a comment

Uh oh!

simranjeetc commented Feb 11, 2021

Uh oh!

simranjeetc commented Feb 11, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

simranjeetc commented Jan 27, 2021 • edited by dermot-hardy Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

buildmachine-sou-jenkins2 commented Jan 27, 2021

Uh oh!

simranjeetc commented Feb 3, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dermot-hardy left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

dermot-hardy left a comment

Choose a reason for hiding this comment

Uh oh!

simranjeetc commented Feb 11, 2021

Uh oh!

simranjeetc commented Feb 11, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

simranjeetc commented Jan 27, 2021 •

edited by dermot-hardy

Loading

dermot-hardy left a comment •

edited

Loading