Feature/ab2 d 5128 remove eventlogger (#1128)

* Remove inicial code

* revert change

* More changes

* Fix tests

* Update AuthenticationTests.java

* Update BulkDataAccessAPIUnusualDataTests.java

* update api tests

* Fix API Tests

* Fix Audit Test

* Modify tests in common and coverage

* Fix Worker Tests

* Clean unused. code

* Clean unused code

* First attempt remove log manager

* Update HPMSMockedAuthTest.java

* remove eventlogger module

* remove eventlogger from jenkinsfile

* Update application.properties

* Update UtilMethods.java

* Create HealthAPITest.java

* Update HealthAPITest.java

* Move util to api module

* Create UtilMethodsTest.java

* Update pom.xml

Author: sb-dkniesteadt

.gitignore

@@ -90,6 +90,7 @@ build/
 
 common/jacoco/**
 coverage/jacoco/**
+properties/jacoco/**
 
 ### .DS_Store in "src/test" ###
 ### This is needed due to this .gitignore entry: "!**/src/test/**" ###

Jenkinsfile

@@ -87,7 +87,7 @@ pipeline {
                 withCredentials([usernamePassword(credentialsId: 'artifactoryuserpass', usernameVariable: 'ARTIFACTORY_USER', passwordVariable: 'ARTIFACTORY_PASSWORD')]) {
                     sh '''
                         export AB2D_EFS_MOUNT="${AB2D_HOME}"
-                        mvn --settings settings.xml -Dartifactory.username=${ARTIFACTORY_USER} -Dartifactory.password=${ARTIFACTORY_PASSWORD} test -pl eventlogger,common,job,coverage,api,worker,audit,hpms,properties
+                        mvn --settings settings.xml -Dartifactory.username=${ARTIFACTORY_USER} -Dartifactory.password=${ARTIFACTORY_PASSWORD} test -pl common,job,coverage,api,worker,audit,hpms,properties
                     '''
                 }
             }

api/pom.xml

@@ -33,11 +33,6 @@
             <artifactId>hpms</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>gov.cms.ab2d</groupId>
-            <artifactId>eventlogger</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>gov.cms.ab2d</groupId>
             <artifactId>properties</artifactId>

api/src/main/java/gov/cms/ab2d/api/SpringBootApp.java

@@ -10,7 +10,7 @@
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication(scanBasePackages = {"gov.cms.ab2d.common", "gov.cms.ab2d.job", "gov.cms.ab2d.api",
-        "gov.cms.ab2d.hpms", "gov.cms.ab2d.eventlogger", "gov.cms.ab2d.properties", "gov.cms.ab2d.eventclient.clients"})
+        "gov.cms.ab2d.hpms", "gov.cms.ab2d.properties", "gov.cms.ab2d.eventclient.clients"})
 @EntityScan(basePackages = {"gov.cms.ab2d.common.model", "gov.cms.ab2d.job.model", "gov.cms.ab2d.properties.model"})
 @EnableJpaRepositories({"gov.cms.ab2d.common.repository", "gov.cms.ab2d.job.repository", "gov.cms.ab2d.properties.repository"})
 @PropertySource("classpath:application.common.properties")

api/src/main/java/gov/cms/ab2d/api/controller/ErrorHandler.java

@@ -10,17 +10,17 @@
 import gov.cms.ab2d.api.security.MissingTokenException;
 import gov.cms.ab2d.common.service.InvalidClientInputException;
 import gov.cms.ab2d.common.service.InvalidContractException;
+import gov.cms.ab2d.api.util.UtilMethods;
+import gov.cms.ab2d.eventclient.clients.SQSEventClient;
 import gov.cms.ab2d.eventclient.config.Ab2dEnvironment;
 import gov.cms.ab2d.eventclient.events.ApiResponseEvent;
 import gov.cms.ab2d.eventclient.events.ErrorEvent;
+import gov.cms.ab2d.fhir.FhirVersion;
 import gov.cms.ab2d.job.service.InvalidJobAccessException;
 import gov.cms.ab2d.job.service.InvalidJobStateTransition;
-import gov.cms.ab2d.properties.service.InvalidPropertiesException;
 import gov.cms.ab2d.job.service.JobOutputMissingException;
+import gov.cms.ab2d.properties.service.InvalidPropertiesException;
 import gov.cms.ab2d.properties.service.ResourceNotFoundException;
-import gov.cms.ab2d.eventlogger.LogManager;
-import gov.cms.ab2d.eventlogger.utils.UtilMethods;
-import gov.cms.ab2d.fhir.FhirVersion;
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.HashMap;
@@ -60,7 +60,7 @@
 @Slf4j
 public class ErrorHandler extends ResponseEntityExceptionHandler {
 
-    private final LogManager eventLogger;
+    private final SQSEventClient eventLogger;
     private final int retryAfterDelay;
     private final ApiCommon apiCommon;
 
@@ -88,7 +88,7 @@ public class ErrorHandler extends ResponseEntityExceptionHandler {
             RESPONSE_MAP.put(DataIntegrityViolationException.class, HttpStatus.INTERNAL_SERVER_ERROR);
         }
 
-    public ErrorHandler(LogManager eventLogger, @Value("${api.retry-after.delay}") int retryAfterDelay, ApiCommon apiCommon) {
+    public ErrorHandler(SQSEventClient eventLogger, @Value("${api.retry-after.delay}") int retryAfterDelay, ApiCommon apiCommon) {
         this.eventLogger = eventLogger;
         this.retryAfterDelay = retryAfterDelay;
         this.apiCommon = apiCommon;
@@ -121,7 +121,7 @@ public ResponseEntity<JsonNode> assertionException(final Exception e, HttpServle
 
     @ExceptionHandler({JobOutputMissingException.class})
     public ResponseEntity<JsonNode> handleJobOutputMissing(Exception e, HttpServletRequest request) throws IOException {
-        eventLogger.log(new ErrorEvent(MDC.get(ORGANIZATION), UtilMethods.parseJobId(request.getRequestURI()),
+        eventLogger.sendLogs(new ErrorEvent(MDC.get(ORGANIZATION), UtilMethods.parseJobId(request.getRequestURI()),
                 ErrorEvent.ErrorType.FILE_ALREADY_DELETED, getRootCause(e)));
         return generateFHIRError(e, request);
     }
@@ -131,7 +131,7 @@ public ResponseEntity<Void> handleInvalidContractErrors(Exception ex, HttpServle
         HttpStatus status = getErrorResponse(ex.getClass());
         String description = API_INVALID_CONTRACT + " " + getRootCause(ex);
 
-        eventLogger.log(new ErrorEvent(MDC.get(ORGANIZATION), null,
+        eventLogger.sendLogs(new ErrorEvent(MDC.get(ORGANIZATION), null,
                 ErrorEvent.ErrorType.UNAUTHORIZED_CONTRACT, description));
 
         ApiResponseEvent responseEvent = new ApiResponseEvent(MDC.get(ORGANIZATION), null, status,
@@ -161,7 +161,7 @@ public ResponseEntity<Void> handleAuthorizationErrors(Exception ex, HttpServletR
         // Then log to other destinations
         ApiResponseEvent responseEvent = new ApiResponseEvent(MDC.get(ORGANIZATION), null, status,
                 "API Error", description, (String) request.getAttribute(REQUEST_ID));
-        eventLogger.log(responseEvent);
+        eventLogger.sendLogs(responseEvent);
 
         return new ResponseEntity<>(null, null, status);
     }
@@ -174,7 +174,7 @@ public ResponseEntity<Void> handleMaintenanceMode(Exception ex, HttpServletReque
         log.warn("Maintenance mode blocked API request " + request.getAttribute(REQUEST_ID));
 
         // Then log to other destinations
-        eventLogger.log(new ApiResponseEvent(MDC.get(ORGANIZATION), null, status,
+        eventLogger.sendLogs(new ApiResponseEvent(MDC.get(ORGANIZATION), null, status,
                 "API Error", ex.getClass().getSimpleName(), (String) request.getAttribute(REQUEST_ID)));
         eventLogger.trace("API_MAINT_BLOCKED Maintenance mode blocked API request " + request.getAttribute(REQUEST_ID), Ab2dEnvironment.PROD_LIST);
 
@@ -188,7 +188,7 @@ public ResponseEntity<JsonNode> handleTooManyRequestsExceptions(final TooManyReq
         if (e.getJobIds() != null) {
             generateContentLocation(e, request, httpHeaders);
         }
-        eventLogger.log(new ErrorEvent(MDC.get(ORGANIZATION), UtilMethods.parseJobId(request.getRequestURI()),
+        eventLogger.sendLogs(new ErrorEvent(MDC.get(ORGANIZATION), UtilMethods.parseJobId(request.getRequestURI()),
                 ErrorEvent.ErrorType.TOO_MANY_STATUS_REQUESTS, "Too many requests performed in too short a time"));
         return generateFHIRError(e, httpHeaders, request);
     }
@@ -224,7 +224,7 @@ private ResponseEntity<JsonNode> generateFHIRError(Exception e, HttpHeaders http
         // Log so that Splunk can pick this up and alert
         log.warn("{} {}", ExceptionUtils.getRootCause(e).getClass(), msg);
 
-        eventLogger.log(new ApiResponseEvent(MDC.get(ORGANIZATION), null,
+        eventLogger.sendLogs(new ApiResponseEvent(MDC.get(ORGANIZATION), null,
                 ErrorHandler.getErrorResponse(e.getClass()),
                 "FHIR Error", msg, (String) request.getAttribute(REQUEST_ID)));
 

api/src/main/java/gov/cms/ab2d/api/controller/HealthAPI.java

@@ -1,8 +1,9 @@
 package gov.cms.ab2d.api.controller;
 
 import gov.cms.ab2d.api.util.HealthCheck;
+import gov.cms.ab2d.eventclient.clients.SQSEventClient;
 import gov.cms.ab2d.eventclient.events.ApiResponseEvent;
-import gov.cms.ab2d.eventlogger.LogManager;
+import javax.servlet.http.HttpServletRequest;
 import lombok.AllArgsConstructor;
 import org.slf4j.MDC;
 import org.springframework.http.HttpStatus;
@@ -11,16 +12,17 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
 
-import static gov.cms.ab2d.common.util.Constants.*;
+import static gov.cms.ab2d.common.util.Constants.HEALTH_ENDPOINT;
+import static gov.cms.ab2d.common.util.Constants.ORGANIZATION;
+import static gov.cms.ab2d.common.util.Constants.REQUEST_ID;
 
 @AllArgsConstructor
 @RestController
 public class HealthAPI {
 
     private final HealthCheck healthCheck;
-    private final LogManager eventLogger;
+    private final SQSEventClient eventLogger;
 
     // Add exceptions for testing and prod site
     @CrossOrigin(origins = {"http://127.0.0.1:4000", "https://ab2d.cms.gov", "http://ab2d.cms.gov"})
@@ -29,7 +31,7 @@ public ResponseEntity<Void> getHealth(HttpServletRequest request) {
         if (healthCheck.healthy()) {
             return new ResponseEntity<>(HttpStatus.OK);
         } else {
-            eventLogger.log(new ApiResponseEvent(MDC.get(ORGANIZATION), null, HttpStatus.INTERNAL_SERVER_ERROR, "API Health NOT Ok",
+            eventLogger.sendLogs(new ApiResponseEvent(MDC.get(ORGANIZATION), null, HttpStatus.INTERNAL_SERVER_ERROR, "API Health NOT Ok",
                     null, (String) request.getAttribute(REQUEST_ID)));
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);
         }

api/src/main/java/gov/cms/ab2d/api/controller/common/ApiCommon.java

@@ -3,17 +3,20 @@
 import gov.cms.ab2d.api.controller.InMaintenanceModeException;
 import gov.cms.ab2d.api.controller.TooManyRequestsException;
 import gov.cms.ab2d.api.remote.JobClient;
-import gov.cms.ab2d.eventclient.events.ApiResponseEvent;
-import gov.cms.ab2d.common.util.PropertyConstants;
-import gov.cms.ab2d.job.dto.StartJobDTO;
 import gov.cms.ab2d.common.model.Contract;
 import gov.cms.ab2d.common.model.PdpClient;
 import gov.cms.ab2d.common.service.InvalidClientInputException;
 import gov.cms.ab2d.common.service.InvalidContractException;
 import gov.cms.ab2d.common.service.PdpClientService;
-import gov.cms.ab2d.properties.service.PropertiesAPIService;
-import gov.cms.ab2d.eventlogger.LogManager;
+import gov.cms.ab2d.common.util.PropertyConstants;
+import gov.cms.ab2d.eventclient.clients.SQSEventClient;
+import gov.cms.ab2d.eventclient.events.ApiResponseEvent;
 import gov.cms.ab2d.fhir.FhirVersion;
+import gov.cms.ab2d.job.dto.StartJobDTO;
+import gov.cms.ab2d.properties.service.PropertiesAPIService;
+import java.time.OffsetDateTime;
+import java.util.Set;
+import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 import org.springframework.http.HttpHeaders;
@@ -22,17 +25,13 @@
 import org.springframework.stereotype.Service;
 import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
-import javax.servlet.http.HttpServletRequest;
 
-import java.time.OffsetDateTime;
-import java.util.Set;
-
-import static gov.cms.ab2d.common.util.Constants.ZIPFORMAT;
-import static gov.cms.ab2d.common.util.Constants.SINCE_EARLIEST_DATE;
 import static gov.cms.ab2d.common.util.Constants.FHIR_PREFIX;
+import static gov.cms.ab2d.common.util.Constants.JOB_LOG;
 import static gov.cms.ab2d.common.util.Constants.ORGANIZATION;
+import static gov.cms.ab2d.common.util.Constants.SINCE_EARLIEST_DATE;
+import static gov.cms.ab2d.common.util.Constants.ZIPFORMAT;
 import static gov.cms.ab2d.common.util.Constants.ZIP_SUPPORT_ON;
-import static gov.cms.ab2d.common.util.Constants.JOB_LOG;
 import static gov.cms.ab2d.fhir.BundleUtils.EOB;
 import static java.time.format.DateTimeFormatter.ISO_DATE_TIME;
 import static java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME;
@@ -41,7 +40,7 @@
 @Service
 @Slf4j
 public class ApiCommon {
-    private final LogManager eventLogger;
+    private final SQSEventClient eventLogger;
     private final JobClient jobClient;
     private final PropertiesAPIService propertiesApiService;
     private final PdpClientService pdpClientService;
@@ -52,7 +51,7 @@ public class ApiCommon {
     public static final Set<String> ALLOWABLE_OUTPUT_FORMAT_SET = Set.of(ALLOWABLE_OUTPUT_FORMATS.split(","));
     public static final String JOB_CANCELLED_MSG = "Job canceled";
 
-    public ApiCommon(LogManager eventLogger, JobClient jobClient, PropertiesAPIService propertiesApiService,
+    public ApiCommon(SQSEventClient eventLogger, JobClient jobClient, PropertiesAPIService propertiesApiService,
                      PdpClientService pdpClientService) {
         this.eventLogger = eventLogger;
         this.jobClient = jobClient;
@@ -114,7 +113,7 @@ public ResponseEntity<Void> returnStatusForJobCreation(String jobGuid, String ap
         String statusURL = getUrl(apiPrefix + FHIR_PREFIX + "/Job/" + jobGuid + "/$status", request);
         HttpHeaders responseHeaders = new HttpHeaders();
         responseHeaders.add(CONTENT_LOCATION, statusURL);
-        eventLogger.log(new ApiResponseEvent(MDC.get(ORGANIZATION), jobGuid, HttpStatus.ACCEPTED, "Job Created",
+        eventLogger.sendLogs(new ApiResponseEvent(MDC.get(ORGANIZATION), jobGuid, HttpStatus.ACCEPTED, "Job Created",
                 "Job " + jobGuid + " was created", requestId));
         return new ResponseEntity<>(null, responseHeaders,
                 HttpStatus.ACCEPTED);

api/src/main/java/gov/cms/ab2d/api/controller/common/FileDownloadCommon.java

@@ -2,8 +2,13 @@
 
 import gov.cms.ab2d.api.remote.JobClient;
 import gov.cms.ab2d.common.service.PdpClientService;
+import gov.cms.ab2d.eventclient.clients.SQSEventClient;
 import gov.cms.ab2d.eventclient.events.ApiResponseEvent;
-import gov.cms.ab2d.eventlogger.LogManager;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
@@ -14,24 +19,19 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.OutputStream;
 
-import static gov.cms.ab2d.common.util.Constants.ORGANIZATION;
 import static gov.cms.ab2d.common.util.Constants.FILE_LOG;
 import static gov.cms.ab2d.common.util.Constants.JOB_LOG;
 import static gov.cms.ab2d.common.util.Constants.NDJSON_FIRE_CONTENT_TYPE;
+import static gov.cms.ab2d.common.util.Constants.ORGANIZATION;
 import static gov.cms.ab2d.common.util.Constants.REQUEST_ID;
 
 @Service
 @AllArgsConstructor
 @Slf4j
 public class FileDownloadCommon {
     private final JobClient jobClient;
-    private final LogManager eventLogger;
+    private final SQSEventClient eventLogger;
     private final PdpClientService pdpClientService;
 
     public ResponseEntity<String> downloadFile(String jobUuid, String filename, HttpServletRequest request, HttpServletResponse response) throws IOException {
@@ -52,7 +52,7 @@ public ResponseEntity<String> downloadFile(String jobUuid, String filename, Http
         try (OutputStream out = response.getOutputStream(); FileInputStream in = new FileInputStream(downloadResource.getFile())) {
             IOUtils.copy(in, out);
 
-            eventLogger.log(new ApiResponseEvent(MDC.get(ORGANIZATION), jobUuid, HttpStatus.OK, "File Download",
+            eventLogger.sendLogs(new ApiResponseEvent(MDC.get(ORGANIZATION), jobUuid, HttpStatus.OK, "File Download",
                     "File " + filename + " was downloaded", (String) request.getAttribute(REQUEST_ID)));
             jobClient.incrementDownload(downloadResource.getFile(), jobUuid);
             return new ResponseEntity<>(null, null, HttpStatus.OK);

api/src/main/java/gov/cms/ab2d/api/controller/common/StatusCommon.java

@@ -4,13 +4,19 @@
 import gov.cms.ab2d.api.controller.JobProcessingException;
 import gov.cms.ab2d.api.controller.TooManyRequestsException;
 import gov.cms.ab2d.api.remote.JobClient;
-import gov.cms.ab2d.job.dto.JobPollResult;
 import gov.cms.ab2d.common.model.PdpClient;
 import gov.cms.ab2d.common.model.TooFrequentInvocations;
 import gov.cms.ab2d.common.service.PdpClientService;
-import gov.cms.ab2d.eventlogger.LogManager;
+import gov.cms.ab2d.eventclient.clients.SQSEventClient;
 import gov.cms.ab2d.eventclient.events.ApiResponseEvent;
+import gov.cms.ab2d.job.dto.JobPollResult;
 import gov.cms.ab2d.job.model.JobOutput;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Value;
@@ -19,19 +25,12 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
-
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.List;
 
 import static gov.cms.ab2d.api.controller.common.ApiText.X_PROG;
-import static gov.cms.ab2d.common.util.Constants.ORGANIZATION;
+import static gov.cms.ab2d.common.util.Constants.FHIR_PREFIX;
 import static gov.cms.ab2d.common.util.Constants.JOB_LOG;
+import static gov.cms.ab2d.common.util.Constants.ORGANIZATION;
 import static gov.cms.ab2d.common.util.Constants.REQUEST_ID;
-import static gov.cms.ab2d.common.util.Constants.FHIR_PREFIX;
 import static org.springframework.http.HttpHeaders.EXPIRES;
 import static org.springframework.http.HttpHeaders.RETRY_AFTER;
 
@@ -40,11 +39,11 @@
 public class StatusCommon {
     private final PdpClientService pdpClientService;
     private final JobClient jobClient;
-    private final LogManager eventLogger;
+    private final SQSEventClient eventLogger;
     private final int retryAfterDelay;
 
     StatusCommon(PdpClientService pdpClientService, JobClient jobClient,
-                 LogManager eventLogger, @Value("${api.retry-after.delay}") int retryAfterDelay) {
+                 SQSEventClient eventLogger, @Value("${api.retry-after.delay}") int retryAfterDelay) {
         this.pdpClientService = pdpClientService;
         this.jobClient = jobClient;
         this.eventLogger = eventLogger;
@@ -77,7 +76,7 @@ public ResponseEntity doStatus(String jobUuid, HttpServletRequest request, Strin
             case IN_PROGRESS:
                 responseHeaders.add(X_PROG, jobPollResult.getProgress() + "% complete");
                 responseHeaders.add(RETRY_AFTER, Integer.toString(retryAfterDelay));
-                eventLogger.log(new ApiResponseEvent(MDC.get(ORGANIZATION), jobUuid, HttpStatus.ACCEPTED,
+                eventLogger.sendLogs(new ApiResponseEvent(MDC.get(ORGANIZATION), jobUuid, HttpStatus.ACCEPTED,
                         "Job in progress", jobPollResult.getProgress() + "% complete",
                         (String) request.getAttribute(REQUEST_ID)));
                 return new ResponseEntity<>(null, responseHeaders, HttpStatus.ACCEPTED);
@@ -137,7 +136,7 @@ private ResponseEntity getSuccessResponse(JobPollResult jobPollResult, String jo
         responseHeaders.add(EXPIRES, DateTimeFormatter.RFC_1123_DATE_TIME.format(jobExpiresUTC));
         final JobCompletedResponse resp = getJobCompletedResponse(jobPollResult, jobUuid, request, apiPrefix);
         log.info("Job status completed successfully");
-        eventLogger.log(new ApiResponseEvent(MDC.get(ORGANIZATION), jobUuid, HttpStatus.OK,
+        eventLogger.sendLogs(new ApiResponseEvent(MDC.get(ORGANIZATION), jobUuid, HttpStatus.OK,
                 "Job completed", null, (String) request.getAttribute(REQUEST_ID)));
         return new ResponseEntity<>(resp, responseHeaders, HttpStatus.OK);
     }
@@ -150,7 +149,7 @@ public ResponseEntity cancelJob(String jobUuid, HttpServletRequest request) {
 
         log.info("Job successfully cancelled");
 
-        eventLogger.log(new ApiResponseEvent(MDC.get(ORGANIZATION), jobUuid, HttpStatus.ACCEPTED,
+        eventLogger.sendLogs(new ApiResponseEvent(MDC.get(ORGANIZATION), jobUuid, HttpStatus.ACCEPTED,
                 "Job cancelled", null, (String) request.getAttribute(REQUEST_ID)));
 
         return new ResponseEntity<>(null, null,