Merge branch 'master' into dep/dependency_upgrade_staging

cerberus-web/build.gradle

@@ -55,7 +55,6 @@ dependencies {
   implementation "io.spinnaker.kork:kork-secrets:${versions.kork}"
 
   // Misc
-  implementation "com.netflix.hystrix:hystrix-core:1.5.18" // TODO remove hystrix and use resilience4j
   implementation "com.google.guava:guava:${versions.guava}"  // todo, pretty sure with Java 11, we can get ride of this, we mostly use this for the collection builders.
   implementation 'com.google.code.gson:gson:2.9.1' // todo delete, should use jackson. see cipher text utils
 

cerberus-web/src/main/java/com/nike/cerberus/jobs/OrphanedKmsKeyCleanUpJob.java

@@ -25,7 +25,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

cerberus-web/src/main/resources/cerberus.yaml

@@ -233,11 +233,6 @@ cerberus:
       # Every ten minutes
       cronExpression: "0 */10 * ? * *"
 
-    # Generates drop wizard metrics on the status of Hystrix for monitoring and alerting
-    hystrixMetricsProcessingJob:
-      enabled: true
-      # Every ten seconds
-      cronExpression: "0/10 * * ? * *"
 
     # This job will generate Key Performance Indicator Metrics (KPIs) for the Cerberus environment and use Drop Wizard to report these Metrics
     # By default unless you provide your own reporter impl, these metrics are just logged via an SLF4j Logger.