fix

Author: trask

smoke-tests/apps/JavaUtilLogging/src/main/java/com/microsoft/applicationinsights/smoketestapp/JavaUtilLoggingWithExceptionServlet.java

@@ -16,11 +16,12 @@ public class JavaUtilLoggingWithExceptionServlet extends HttpServlet {
   private static final Logger logger = Logger.getLogger("smoketestapp");
 
   protected void doGet(HttpServletRequest request, HttpServletResponse response) {
+    Exception e = testNullMessage(request) ? new Exception() : new Exception("Fake Exception");
+    logger.log(Level.SEVERE, "This is an exception!", e);
+  }
+
+  private static boolean testNullMessage(HttpServletRequest request) {
     String testNullMessage = request.getParameter("test-null-message");
-    if ("true".equalsIgnoreCase(testNullMessage)) {
-      logger.log(Level.SEVERE, "This is an exception!", new Exception());
-    } else {
-      logger.log(Level.SEVERE, "This is an exception!", new Exception("Fake Exception"));
-    }
+    return "true".equalsIgnoreCase(testNullMessage);
   }
 }

smoke-tests/apps/Log4j1/src/main/java/com/microsoft/applicationinsights/smoketestapp/Log4j1WithExceptionServlet.java

@@ -35,12 +35,13 @@ public class Log4j1WithExceptionServlet extends HttpServlet {
   @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response) {
     MDC.put("MDC key", "MDC value");
-    String testNullMessage = request.getParameter("test-null-message");
-    if ("true".equalsIgnoreCase(testNullMessage)) {
-      logger.error("This is an exception!", new Exception());
-    } else {
-      logger.error("This is an exception!", new Exception("Fake Exception"));
-    }
+    Exception e = testNullMessage(request) ? new Exception() : new Exception("Fake Exception");
+    logger.error("This is an exception!", e);
     MDC.remove("MDC key");
   }
+
+  private static boolean testNullMessage(HttpServletRequest request) {
+    String testNullMessage = request.getParameter("test-null-message");
+    return "true".equalsIgnoreCase(testNullMessage);
+  }
 }

smoke-tests/apps/Log4j2/src/main/java/com/microsoft/applicationinsights/smoketestapp/Log4j2WithExceptionServlet.java

@@ -18,12 +18,13 @@ public class Log4j2WithExceptionServlet extends HttpServlet {
 
   protected void doGet(HttpServletRequest request, HttpServletResponse response) {
     ThreadContext.put("MDC key", "MDC value");
-    String testNullMessage = request.getParameter("test-null-message");
-    if ("true".equalsIgnoreCase(testNullMessage)) {
-      logger.error("This is an exception!", new Exception());
-    } else {
-      logger.error("This is an exception!", new Exception("Fake Exception"));
-    }
+    Exception e = testNullMessage(request) ? new Exception() : new Exception("Fake Exception");
+    logger.error("This is an exception!", e);
     ThreadContext.remove("MDC key");
   }
+
+  private static boolean testNullMessage(HttpServletRequest request) {
+    String testNullMessage = request.getParameter("test-null-message");
+    return "true".equalsIgnoreCase(testNullMessage);
+  }
 }

smoke-tests/apps/Logback/src/main/java/com/microsoft/applicationinsights/smoketestapp/LogbackWithExceptionServlet.java

@@ -18,12 +18,13 @@ public class LogbackWithExceptionServlet extends HttpServlet {
 
   protected void doGet(HttpServletRequest request, HttpServletResponse response) {
     MDC.put("MDC key", "MDC value");
-    String testNullMessage = request.getParameter("test-null-message");
-    if ("true".equalsIgnoreCase(testNullMessage)) {
-      logger.error("This is an exception!", new Exception());
-    } else {
-      logger.error("This is an exception!", new Exception("Fake Exception"));
-    }
+    Exception e = testNullMessage(request) ? new Exception() : new Exception("Fake Exception");
+    logger.error("This is an exception!", e);
     MDC.remove("MDC key");
   }
+
+  private static boolean testNullMessage(HttpServletRequest request) {
+    String testNullMessage = request.getParameter("test-null-message");
+    return "true".equalsIgnoreCase(testNullMessage);
+  }
 }

smoke-tests/apps/Logback/src/smokeTest/java/com/microsoft/applicationinsights/smoketest/LogbackTest.java

@@ -162,7 +162,7 @@ private void testWithException(boolean testNullMessage) throws Exception {
               "ClassName",
               "com.microsoft.applicationinsights.smoketestapp.LogbackWithExceptionServlet")
           .containsEntry("MethodName", "doGet")
-          .containsEntry("LineNumber", "25")
+          .containsEntry("LineNumber", "22")
           .hasSize(9);
     } else {
       assertThat(ed.getProperties()).hasSize(5);