Adjust troubleshooting header

Author: skjolber

on-demand/on-demand-spring-boot-starter-grpc/src/main/java/no/entur/logging/cloud/spring/ondemand/grpc/GrpcOndemandLoggingAutoConfiguration.java

@@ -129,23 +129,13 @@ public GrpcLoggingScopeFilter toFilter(String serviceName, List<String> methodNa
 
                 LOGGER.info("Configure GRPC {} troubleshooting {} logging for headers {}", methodNames.isEmpty() ? serviceName : serviceName + methodNames, troubleshoot.getLevel(), troubleshootHeaderNames);
 
-                // troubleshooting: to take effect, the troubleshooting must be
-                //  - lower than success, and/or
-                //  - lower than failure
+                // troubleshooting: lower the success / failure level
                 Level troubleShootAlwaysLogLevel = toLevel(troubleshoot.getLevel());
-                if(troubleShootAlwaysLogLevel.toInt() > alwaysLogLevel.toInt()) {
-                    filter.setTroubleshootQueuePredicate( (e) -> e.getLevel().toInt() < alwaysLogLevel.toInt());
-                } else {
-                    filter.setTroubleshootQueuePredicate( (e) -> e.getLevel().toInt() < troubleShootAlwaysLogLevel.toInt());
-                }
-
-                Level troubleShootOptionallyLogLevel = troubleShootAlwaysLogLevel;
-                if( troubleShootOptionallyLogLevel.toInt() > optionallyLogLevel.toInt()) {
-                    filter.setTroubleshootIgnorePredicate( (e) -> e.getLevel().toInt() < optionallyLogLevel.toInt());
-                } else {
-                    filter.setTroubleshootIgnorePredicate( (e) -> e.getLevel().toInt() < troubleShootOptionallyLogLevel.toInt());
-                }
+                int alwaysLogLevelWhenTroubleShooting = Math.min(alwaysLogLevel.toInt(), troubleShootAlwaysLogLevel.toInt());
+                filter.setTroubleshootQueuePredicate((e) -> e.getLevel().toInt() < alwaysLogLevelWhenTroubleShooting);
 
+                int optionalLogLevelWhenTroubleShooting = Math.min(optionallyLogLevel.toInt(), troubleShootAlwaysLogLevel.toInt());
+                filter.setTroubleshootIgnorePredicate((e) -> e.getLevel().toInt() < optionalLogLevelWhenTroubleShooting);
             } else {
                 filter.setGrpcHeaderPresentPredicate((e) -> false);
                 filter.setTroubleshootQueuePredicate((e) -> false);

on-demand/on-demand-spring-boot-starter-web/src/main/java/no/entur/logging/cloud/spring/ondemand/web/GcpWebOndemandLoggingAutoConfiguration.java

@@ -129,22 +129,13 @@ public HttpLoggingScopeFilter toFilter(String matcher, OndemandSuccess success,
 
                 LOGGER.info("Configure {} troubleshooting {} logging for headers {}", matcher == null ? "default" : matcher, troubleshoot.getLevel().toString(), troubleshootHeaderNames);
 
-                // troubleshooting: to take effect, the troubleshooting must be
-                //  - lower than success, and/or
-                //  - lower than failure
+                // troubleshooting: lower the success / failure level
                 Level troubleShootAlwaysLogLevel = toLevel(troubleshoot.getLevel());
-                if (troubleShootAlwaysLogLevel.toInt() > alwaysLogLevel.toInt()) {
-                    filter.setTroubleshootQueuePredicate((e) -> e.getLevel().toInt() < alwaysLogLevel.toInt());
-                } else {
-                    filter.setTroubleshootQueuePredicate((e) -> e.getLevel().toInt() < troubleShootAlwaysLogLevel.toInt());
-                }
+                int alwaysLogLevelWhenTroubleShooting = Math.min(alwaysLogLevel.toInt(), troubleShootAlwaysLogLevel.toInt());
+                filter.setTroubleshootQueuePredicate((e) -> e.getLevel().toInt() < alwaysLogLevelWhenTroubleShooting);
 
-                Level troubleShootOptionallyLogLevel = troubleShootAlwaysLogLevel;
-                if (troubleShootOptionallyLogLevel.toInt() > optionallyLogLevel.toInt()) {
-                    filter.setTroubleshootIgnorePredicate((e) -> e.getLevel().toInt() < optionallyLogLevel.toInt());
-                } else {
-                    filter.setTroubleshootIgnorePredicate((e) -> e.getLevel().toInt() < troubleShootOptionallyLogLevel.toInt());
-                }
+                int optionalLogLevelWhenTroubleShooting = Math.min(optionallyLogLevel.toInt(), troubleShootAlwaysLogLevel.toInt());
+                filter.setTroubleshootIgnorePredicate((e) -> e.getLevel().toInt() < optionalLogLevelWhenTroubleShooting);
             } else {
                 filter.setTroubleshootQueuePredicate((e) -> false);
                 filter.setTroubleshootIgnorePredicate((e) -> false);