Merge pull request #26 from KarstenSchnitter/version-2.1.5

Version 2.1.5

Author: KarstenSchnitter

README.md

@@ -27,11 +27,11 @@ All in all, you should do the following:
 * adjust your logging configuration accordingly.
 
 
-Say, you want to make use of the *servlet filter* feature, then you need to add the following dependency to your POM with property `cf-logging-version` referring to the latest nexus version (currently `2.1.4`):
+Say, you want to make use of the *servlet filter* feature, then you need to add the following dependency to your POM with property `cf-logging-version` referring to the latest nexus version (currently `2.1.5`):
 
 ```xml
 <properties>
-	<cf-logging-version>2.1.4</cf-logging-version>
+	<cf-logging-version>2.1.5</cf-logging-version>
 </properties>
 ```
 
@@ -153,7 +153,7 @@ description about how to apply this feature can be found
 
 ## Logging Stacktraces
 
-Stacktraces can be logged within one log message. Further details can be found 
+Stacktraces can be logged within one log message. Further details can be found
 [here](https://github.com/SAP/cf-java-logging-support/wiki/Logging-Stack-Traces).
 
 ## Sample Application

cf-java-logging-support-core/pom.xml

@@ -32,7 +32,7 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <build>

cf-java-logging-support-jersey/pom.xml

@@ -9,7 +9,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.5</version>
     </parent>
 
     <name>cf-java-logging-support-jersey</name>

cf-java-logging-support-log4j2/pom.xml

@@ -11,7 +11,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.5</version>
     </parent>
 
     <dependencies>

cf-java-logging-support-logback/pom.xml

@@ -10,7 +10,7 @@
         <relativePath>../pom.xml</relativePath>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.5</version>
     </parent>
 
     <dependencies>

cf-java-logging-support-servlet/pom.xml

@@ -9,7 +9,7 @@
     <parent>
         <groupId>com.sap.hcp.cf.logging</groupId>
         <artifactId>cf-java-logging-support-parent</artifactId>
-        <version>2.1.4</version>
+        <version>2.1.5</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

cf-java-logging-support-servlet/src/main/java/com/sap/hcp/cf/logging/servlet/dynlog/DynamicLogLevelProcessor.java

@@ -47,8 +47,12 @@ public void copyDynamicLogLevelToMDC(HttpServletRequest httpRequest) {
                                                        ALLOWED_DYNAMIC_LOGLEVELS.toString());
                 }
             } catch (DynamicLogLevelException e) {
-                LOGGER.error("DynamicLogLevelProcessor could not write dynamic log level to MDC", e);
+                LOGGER.warn("DynamicLogLevelProcessor could not write dynamic log level to MDC", e);
             }
         }
     }
+
+    public void removeDynamicLogLevelFromMDC() {
+        MDC.remove(DynamicLogLevelHelper.MDC_DYNAMIC_LOG_LEVEL_KEY);
+    }
 }

cf-java-logging-support-servlet/src/main/java/com/sap/hcp/cf/logging/servlet/dynlog/TokenCreator.java

@@ -44,7 +44,7 @@ public static void main(String[] args) throws NoSuchAlgorithmException, NoSuchPr
         // "TRACE", "DEBUG", "INFO", "WARN", "ERROR"
         String level = "TRACE";
         // Set a validity period in days
-        int validityPeriodInDays = 2;
+        long validityPeriodInDays = 2;
         // If available provide Base64 encoded private key here:
         String privateKey = "";
         // If available provide Base64 encoded private key here:

cf-java-logging-support-servlet/src/main/java/com/sap/hcp/cf/logging/servlet/dynlog/TokenDecoder.java

@@ -36,7 +36,8 @@ public DecodedJWT validateAndDecodeToken(String token) throws DynamicLogLevelExc
                 throw new DynamicLogLevelException("Token provided to dynamically change the log-level on thread-level is outdated");
             }
         } catch (JWTVerificationException e) {
-            throw new DynamicLogLevelException("Token could not be verified", e);
+            // Exception is not attached to avoid logging of JWT token
+            throw new DynamicLogLevelException("Token could not be verified");
         }
     }
 }

cf-java-logging-support-servlet/src/main/java/com/sap/hcp/cf/logging/servlet/filter/RequestLoggingFilter.java

@@ -85,7 +85,7 @@ public void destroy() {
     private void doFilterRequest(HttpServletRequest httpRequest, HttpServletResponse httpResponse, FilterChain chain)
                                                                                                                       throws IOException,
                                                                                                                       ServletException {
-        if (httpRequest.getHeader(dynLogEnvironment.getDynLogHeaderKey()) != null) {
+        if (httpRequest.getHeader(dynLogEnvironment.getDynLogHeaderKey()) != null && dynamicLogLevelProcessor != null) {
             dynamicLogLevelProcessor.copyDynamicLogLevelToMDC(httpRequest);
         }
         /*
@@ -149,6 +149,10 @@ private void doFilterRequest(HttpServletRequest httpRequest, HttpServletResponse
              */
         } finally {
             rr.close();
+
+            if (dynamicLogLevelProcessor != null) {
+                dynamicLogLevelProcessor.removeDynamicLogLevelFromMDC();
+            }
         }
     }