Merge pull request #178 from dcanar9/master

Adding logging for Auto Merge and adding X-Forwarded-For header to logging filter

Author: tatlax3636

pom.xml

@@ -4,7 +4,7 @@
     <artifactId>api-audit</artifactId>
     <packaging>jar</packaging>
     <name>${project.groupId}:${project.artifactId}</name>
-    <version>3.7.27-SNAPSHOT</version>
+    <version>3.7.28-SNAPSHOT</version>
     <description>Hygieia Audit Rest API Layer</description>
     <url>https://github.com/Hygieia/${repository.name}</url>
 

src/main/java/com/capitalone/dashboard/evaluator/CodeReviewEvaluator.java

@@ -219,7 +219,10 @@ private CodeReviewAuditResponseV2 getPeerReviewResponses(CollectorItem repoItem,
             boolean isPRd = isPeerReviewed ? peerReviewed.add(pr) : notPeerReviewed.add(pr);
         });
 
+
+        Long startTime = System.currentTimeMillis();
         // iterate though the gitRequests that failed the PR audit and check if the PR was auto merged
+        LOGGER.info(String.format("AutoMerge Check :: Reviewing %d Pull Requests with no peer review", notPeerReviewed.size()));
         for(GitRequest noPR: notPeerReviewed){
             boolean foundCommit = false;
 
@@ -253,12 +256,15 @@ private CodeReviewAuditResponseV2 getPeerReviewResponses(CollectorItem repoItem,
                         // add PR audit back to the auditResponse
                         reviewAuditResponseV2.addPullRequest(prAudit);
 
+                        LOGGER.info(String.format("AutoMerge Check :: Correcting auto merged PR's status (ObjectID: %s)", noPR.getId().toString()));
+
                         break;      // exit loop because the commit was verified in another PR
                     }
                 }
                 if(foundCommit){break;}     // stop iterating through PRs if commit was verified
             }
         }
+        LOGGER.info(String.format("AutoMerge Check :: Completed in %d ms", System.currentTimeMillis()-startTime));
 
         //check any commits not directly tied to pr
         commits.stream().filter(commit -> !allPrCommitShas.contains(commit.getScmRevisionNumber()) && StringUtils.isEmpty(commit.getPullNumber()) && commit.getType() == CommitType.New).forEach(reviewAuditResponseV2::addDirectCommit);

src/main/java/com/capitalone/dashboard/exception/ExceptionHandlerAdvice.java

@@ -40,6 +40,7 @@ public ResponseEntity<String> handleException(HttpServletRequest request, Except
                 + ", response_status_message=" + responseStatusMessage
                 + ", response_status=failed"
                 + ", client_ip=" + request.getRemoteAddr()
+                + ", x-forwarded-for=" + request.getHeader("x-forwarded-for")
                 + (StringUtils.equalsIgnoreCase(request.getMethod(), "GET") ? ", " + parameters : StringUtils.EMPTY));
         return ResponseEntity
                 .status(httpStatus)

src/main/java/com/capitalone/dashboard/logging/LoggingFilter.java

@@ -105,6 +105,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
                     + ", response_status=" + (success ? "success" : "failed")
                     + ", response_code=" + httpServletResponse.getStatus()
                     + ", client_ip=" + httpServletRequest.getRemoteAddr()
+                    + ", x-forwarded-for=" + httpServletRequest.getHeader("x-forwarded-for")
                     + (StringUtils.equalsIgnoreCase(httpServletRequest.getMethod(), "GET") ? ", " + parameters : StringUtils.EMPTY));
             return;
         }

src/test/java/com/capitalone/dashboard/evaluator/CodeReviewEvaluatorTest.java

@@ -519,6 +519,7 @@ public void autoMergePRAuditTest(){
         List<GitRequest> prList = makePullRequests(true);
         prList.add(makePullRequests(false).get(0));
         prList.forEach(pr -> pr.setState("merged"));
+        prList.forEach(pr -> pr.setId(new ObjectId()));
         prList.get(1).setReviews(new ArrayList<Review>()); // to avoid null pointer exception
 
         when(gitRequestRepository.findByCollectorItemIdAndMergedAtIsBetween(any(ObjectId.class), any(Long.class), any(Long.class))).thenReturn(prList);