MOSIP-14219 : cherry picked all 1.1.4 patch changes (#1003)

* MOS-31387 : added more loggers for debug (#934) Co-authored-by: Monobikash Das <[email protected]> * MOSIP-13229 : index with latest_trn_dtimes to make the query faster (#940) Co-authored-by: Monobikash Das <[email protected]> * MOSIP-13229 : index with latest_trn_dtimes to make the query faster (#941) * MOSIP-13229 : index with latest_trn_dtimes to make the query faster * MOSIP-13229 : index with latest_trn_dtimes to make the query faster Co-authored-by: Monobikash Das <[email protected]> * MOSIP-14219 : Prometheus endpoint for stages and token invalidate functionality * Merge pull request #958 from MonobikashDas/1.1.4.4 MOSIP-14219 : Prometheus endpoint for stages and token invalidate fun… * 1.1.4.4 (#960) Co-authored-by: M1030448 <[email protected]> * 1.1.4.4 (#966) * 1.1.4.4 * 1.1.4.4 Co-authored-by: M1030448 <[email protected]> Co-authored-by: Monobikash Das <[email protected]> Co-authored-by: Sasikumar Ganesan <[email protected]> Co-authored-by: jpnayak007 <[email protected]> Co-authored-by: M1030448 <[email protected]>
mosip · Jun 10, 2021 · 9d172cf · 9d172cf
1 parent 7be1089
commit 9d172cf
Show file tree

Hide file tree

Showing 43 changed files with 2,578 additions and 2,701 deletions.
diff --git a/registration-processor/core-processor/registration-processor-abis-handler-stage/pom.xml b/registration-processor/core-processor/registration-processor-abis-handler-stage/pom.xml
@@ -78,16 +78,6 @@
             <version>${powermock.api.mockito.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-core</artifactId>
-            <version>${io.micrometer.prometheus.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
-            <version>${io.micrometer.prometheus.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/...ge/src/main/java/io/mosip/registration/processor/abis/handler/stage/AbisHandlerStage.java b/...ge/src/main/java/io/mosip/registration/processor/abis/handler/stage/AbisHandlerStage.java
@@ -173,7 +173,7 @@ public void deployVerticle() {
 
 	@Override
 	public void start() {
-		router.setRoute(this.postUrl(mosipEventBus.getEventbus(), MessageBusAddress.ABIS_HANDLER_BUS_IN,
+		router.setRoute(this.postUrl(getVertx(), MessageBusAddress.ABIS_HANDLER_BUS_IN,
 				MessageBusAddress.ABIS_HANDLER_BUS_OUT));
 		this.createServer(router.getRouter(), Integer.parseInt(port));
 	}

diff --git a/registration-processor/core-processor/registration-processor-abis-middleware-stage/pom.xml b/registration-processor/core-processor/registration-processor-abis-middleware-stage/pom.xml
@@ -84,16 +84,6 @@
 			<version>${powermock.api.mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-core</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

diff --git a/.../main/java/io/mosip/registartion/processor/abis/middleware/stage/AbisMiddleWareStage.java b/.../main/java/io/mosip/registartion/processor/abis/middleware/stage/AbisMiddleWareStage.java
diff --git a/registration-processor/core-processor/registration-processor-abis/pom.xml b/registration-processor/core-processor/registration-processor-abis/pom.xml
@@ -90,16 +90,6 @@
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-core</artifactId>
-            <version>${io.micrometer.prometheus.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>io.micrometer</groupId>
-            <artifactId>micrometer-registry-prometheus</artifactId>
-            <version>${io.micrometer.prometheus.version}</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/registration-processor/core-processor/registration-processor-bio-dedupe-stage/pom.xml b/registration-processor/core-processor/registration-processor-bio-dedupe-stage/pom.xml
@@ -87,16 +87,6 @@
 			<version>${powermock.api.mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-core</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
 	</dependencies>
 <build>
 		<plugins>

diff --git a/...e-stage/src/main/java/io/mosip/registration/processor/biodedupe/stage/BioDedupeStage.java b/...e-stage/src/main/java/io/mosip/registration/processor/biodedupe/stage/BioDedupeStage.java
@@ -58,7 +58,7 @@ public void deployVerticle() {
 
 	@Override
 	public void start(){
-		router.setRoute(this.postUrl(mosipEventBus.getEventbus(), MessageBusAddress.BIO_DEDUPE_BUS_IN, MessageBusAddress.BIO_DEDUPE_BUS_OUT));
+		router.setRoute(this.postUrl(getVertx(), MessageBusAddress.BIO_DEDUPE_BUS_IN, MessageBusAddress.BIO_DEDUPE_BUS_OUT));
 		this.createServer(router.getRouter(), Integer.parseInt(port));
 	}
 

diff --git a/...on-processor/core-processor/registration-processor-biometric-authentication-stage/pom.xml b/...on-processor/core-processor/registration-processor-biometric-authentication-stage/pom.xml
@@ -77,16 +77,6 @@
 			<version>${powermock.api.mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-core</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>io.mosip.kernel</groupId>
 			<artifactId>kernel-templatemanager-velocity</artifactId>

diff --git a/...p/registration/processor/biometric/authentication/stage/BiometricAuthenticationStage.java b/...p/registration/processor/biometric/authentication/stage/BiometricAuthenticationStage.java
@@ -123,7 +123,7 @@ public void deployVerticle() {
 
 	@Override
 	public void start() {
-		router.setRoute(this.postUrl(mosipEventBus.getEventbus(), MessageBusAddress.BIOMETRIC_AUTHENTICATION_BUS_IN,
+		router.setRoute(this.postUrl(getVertx(), MessageBusAddress.BIOMETRIC_AUTHENTICATION_BUS_IN,
 				MessageBusAddress.BIOMETRIC_AUTHENTICATION_BUS_OUT));
 		this.createServer(router.getRouter(), Integer.parseInt(port));
 	}

diff --git a/registration-processor/core-processor/registration-processor-demo-dedupe-stage/pom.xml b/registration-processor/core-processor/registration-processor-demo-dedupe-stage/pom.xml
@@ -79,16 +79,6 @@
 			<version>${powermock.api.mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-core</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

diff --git a/...tage/src/main/java/io/mosip/registration/processor/stages/demodedupe/DemoDedupeStage.java b/...tage/src/main/java/io/mosip/registration/processor/stages/demodedupe/DemoDedupeStage.java
@@ -56,7 +56,7 @@ public void deployVerticle() {
 
 	@Override
 	public void start(){
-		router.setRoute(this.postUrl(mosipEventBus.getEventbus(), MessageBusAddress.DEMO_DEDUPE_BUS_IN, MessageBusAddress.DEMO_DEDUPE_BUS_OUT));
+		router.setRoute(this.postUrl(getVertx(), MessageBusAddress.DEMO_DEDUPE_BUS_IN, MessageBusAddress.DEMO_DEDUPE_BUS_OUT));
 		this.createServer(router.getRouter(), Integer.parseInt(port));
 	}
 

diff --git a/...tration-processor/core-processor/registration-processor-manual-verification-stage/pom.xml b/...tration-processor/core-processor/registration-processor-manual-verification-stage/pom.xml
@@ -115,16 +115,6 @@
 			<version>${powermock.api.mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-core</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
 	</dependencies>
 
 	<build>

diff --git a/registration-processor/core-processor/registration-processor-reprocessor-stage/pom.xml b/registration-processor/core-processor/registration-processor-reprocessor-stage/pom.xml
@@ -81,16 +81,6 @@
 			<artifactId>mockito-core</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-core</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>

diff --git a/...age/src/main/java/io/mosip/registration/processor/reprocessor/stage/ReprocessorStage.java b/...age/src/main/java/io/mosip/registration/processor/reprocessor/stage/ReprocessorStage.java
@@ -193,7 +193,7 @@ public void sendMessage(MessageDTO message, MessageBusAddress toAddress) {
 
 	@Override
 	public void start() {
-		router.setRoute(this.postUrl(mosipEventBus.getEventbus(), null, null));
+		router.setRoute(this.postUrl(getVertx(), null, null));
 		this.createServer(router.getRouter(), Integer.parseInt(port));
 	}
 

diff --git a/registration-processor/core-processor/registration-processor-uin-generator-stage/pom.xml b/registration-processor/core-processor/registration-processor-uin-generator-stage/pom.xml
@@ -88,16 +88,6 @@
 			<version>${powermock.api.mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-core</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

diff --git a/...ain/java/io/mosip/registration/processor/stages/uingenerator/stage/UinGeneratorStage.java b/...ain/java/io/mosip/registration/processor/stages/uingenerator/stage/UinGeneratorStage.java
@@ -206,6 +206,9 @@ public MessageDTO process(MessageDTO object) {
 				registrationId, "UinGeneratorStage::process()::entry");
 		UinGenResponseDto uinResponseDto = null;
 
+		regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(),
+				registrationId, "Started processing rid in UinGeneratorStage");
+
 		InternalRegistrationStatusDto registrationStatusDto = registrationStatusService.getRegistrationStatus(registrationId);
 		try {
 			registrationStatusDto
@@ -235,9 +238,15 @@ public MessageDTO process(MessageDTO object) {
 
 				if (StringUtils.isEmpty(uinField) || uinField.equalsIgnoreCase("null") ) {
 
+					regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(),
+							registrationId, "Calling UINGENERATOR API to get unused uin");
+
 					String test = (String) registrationProcessorRestClientService.getApi(ApiName.UINGENERATOR, null, "",
 							"", String.class);
 
+					regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(),
+							registrationId, "Received response from UINGENERATOR API");
+
 					Gson gsonObj = new Gson();
 					uinResponseDto = gsonObj.fromJson(test, UinGenResponseDto.class);
 
@@ -407,9 +416,14 @@ public MessageDTO process(MessageDTO object) {
 			String eventType = eventId.equalsIgnoreCase(EventId.RPR_402.toString()) ? EventType.BUSINESS.toString()
 					: EventType.SYSTEM.toString();
 
+			regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(),
+					registrationId, "Auditing stage result");
 			auditLogRequestBuilder.createAuditRequestBuilder(description.getMessage(), eventId, eventName, eventType,
 					moduleId, moduleName, registrationId);
 
+			regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(),
+					registrationId, "Finished processing rid in UinGeneratorStage");
+
 		}
 
 		return object;
@@ -481,9 +495,15 @@ private IdResponseDTO sendIdRepoWithUin(String regId, String process, JSONObject
 
 		try {
 
+			regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(),
+					regId, "Calling IDREPOSITORY create API to link uin with applicant");
+
 			result = (IdResponseDTO) registrationProcessorRestClientService.postApi(ApiName.IDREPOSITORY, "", "",
 					idRequestDTO, IdResponseDTO.class);
 
+			regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(),
+					regId, "Received response from IDREPOSITORY create API");
+
 		} catch (ApisResourceAccessException e) {
 
 			if (e.getCause() instanceof HttpClientErrorException) {
@@ -972,7 +992,7 @@ private void sendResponseToUinGenerator(String registrationId, String uin, Strin
 				String uinSuccessDescription = "Kernel service called successfully to update the uin status as assigned";
 
 				regProcLogger.info(LoggerFileConstant.SESSIONID.toString(),
-						LoggerFileConstant.REGISTRATIONID.toString() + registrationId, "Success",
+						LoggerFileConstant.REGISTRATIONID.toString(), registrationId,
 						uinSuccessDescription);
 			} else {
 				String uinErrorDescription = "Kernel service called successfully to update the uin status as unassigned";
@@ -1007,7 +1027,7 @@ public void deployVerticle() {
 
 	@Override
 	public void start() {
-		router.setRoute(this.postUrl(mosipEventBus.getEventbus(), MessageBusAddress.UIN_GENERATION_BUS_IN,
+		router.setRoute(this.postUrl(getVertx(), MessageBusAddress.UIN_GENERATION_BUS_IN,
 				MessageBusAddress.UIN_GENERATION_BUS_OUT));
 		this.createServer(router.getRouter(), Integer.parseInt(port));
 
@@ -1022,7 +1042,13 @@ private void generateVid(String registrationId, String UIN, boolean isUinAlready
 
 		try {
 			if (isUinAlreadyPresent) {
+				regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(),
+						registrationId, "Getting UIN from rid by calling IDREPO API");
+
 				String uin = idRepoService.getUinByRid(registrationId, utility.getGetRegProcessorDemographicIdentity());
+
+				regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(),
+						registrationId, "Received response from IDREPO for UIN");
 				vidRequestDto.setUIN(uin);
 			} else {
 				vidRequestDto.setUIN(UIN);
@@ -1041,9 +1067,15 @@ private void generateVid(String registrationId, String UIN, boolean isUinAlready
 					"UinGeneratorStage::generateVid():: post CREATEVID service call started with request data : "
 							+ JsonUtil.objectMapperObjectToJson(request));
 
+			regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(),
+					registrationId, "Calling IDREPO CREATEVID API to create new vid");
+
 			response = (ResponseWrapper<VidResponseDto>) registrationProcessorRestClientService
 					.postApi(ApiName.CREATEVID, "", "", request, ResponseWrapper.class);
 
+			regProcLogger.info(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(),
+					registrationId, "Received response from CREATEVID API");
+
 			regProcLogger.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.REGISTRATIONID.toString(),
 					registrationId,
 					"UinGeneratorStage::generateVid():: create Vid response :: "+JsonUtil.objectMapperObjectToJson(response));

diff --git a/registration-processor/init/registration-processor-packet-receiver-stage/pom.xml b/registration-processor/init/registration-processor-packet-receiver-stage/pom.xml
@@ -118,17 +118,6 @@
 			<artifactId>kernel-virusscanner-clamav</artifactId>
 			<version>${kernel.clamav.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-core</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
-
 	</dependencies>
 	<dependencyManagement>
 		<dependencies>

diff --git a/registration-processor/init/registration-processor-registration-status-service/pom.xml b/registration-processor/init/registration-processor-registration-status-service/pom.xml
@@ -42,16 +42,6 @@
     		<groupId>org.springframework.security</groupId>
     		<artifactId>spring-security-test</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-core</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

diff --git a/registration-processor/pom.xml b/registration-processor/pom.xml
@@ -78,7 +78,6 @@
 		<commons.io.version>2.6</commons.io.version>
 		<velocity.version>1.7</velocity.version>
 		<velocity.tools.version>2.0</velocity.tools.version>
-		<io.micrometer.prometheus.version>1.4.2</io.micrometer.prometheus.version>
 
 		<!-- Test & Logging -->
 		<junit.version>4.12</junit.version>

diff --git a/registration-processor/post-processor/registration-processor-message-sender-stage/pom.xml b/registration-processor/post-processor/registration-processor-message-sender-stage/pom.xml
@@ -95,16 +95,6 @@
 			<artifactId>registration-processor-packet-manager</artifactId>
 			<version>${packet.manager.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-core</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>

diff --git a/registration-processor/post-processor/registration-processor-printing-stage/pom.xml b/registration-processor/post-processor/registration-processor-printing-stage/pom.xml
@@ -94,16 +94,6 @@
 			<version>${powermock.api.mockito.version}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-core</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>io.mosip.registrationprocessor</groupId>
 			<artifactId>registration-processor-info-storage-service</artifactId>

diff --git a/...-processor/post-processor/registration-processor-registration-transaction-service/pom.xml b/...-processor/post-processor/registration-processor-registration-transaction-service/pom.xml
@@ -47,16 +47,6 @@
 			<artifactId>kernel-core</artifactId>
 			<version>${kernel.core.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-core</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>io.micrometer</groupId>
-			<artifactId>micrometer-registry-prometheus</artifactId>
-			<version>${io.micrometer.prometheus.version}</version>
-		</dependency>
 	</dependencies>
 	<build>
 		<plugins>