Merge branch 'wdt-808-main' into 'main'

Enhancing wlsdeploy.debugToStdout system property to log exceptions to stdout/stderr

See merge request weblogic-cloud/weblogic-deploy-tooling!1573

Author: robertpatrick

core/src/main/java/oracle/weblogic/deploy/logging/ConsoleFormatter.java

@@ -1,12 +1,17 @@
 /*
- * Copyright (c) 2019, 2022, Oracle Corporation and/or its affiliates.
+ * Copyright (c) 2019, 2023, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.logging;
 
 import java.util.logging.Formatter;
+import java.util.logging.Level;
+import java.util.logging.LogManager;
 import java.util.logging.LogRecord;
 
+import static oracle.weblogic.deploy.logging.WLSDeployLoggingConfig.HANDLER_LEVEL_PROP;
+import static oracle.weblogic.deploy.logging.WLSDeployLoggingConfig.WLSDEPLOY_STDOUT_CONSOLE_HANDLER;
+
 /**
  * This class removes the Exception record from the LogRecord before formatting so that a
  * stack trace will not print to the Console. The WLSDeployLogFormatter is by default called to
@@ -17,10 +22,22 @@ public class ConsoleFormatter extends Formatter {
 
     // Default Formatter if another is not injected
     private Formatter formatter = new WLSDeployLogFormatter();
+    private boolean suppressExceptions = true;
+
+    public ConsoleFormatter() {
+        String stdoutHandlerLevel =
+            LogManager.getLogManager().getProperty(WLSDEPLOY_STDOUT_CONSOLE_HANDLER + HANDLER_LEVEL_PROP);
+        if (stdoutHandlerLevel != null && stdoutHandlerLevel.equalsIgnoreCase(Level.ALL.toString())) {
+            suppressExceptions = false;
+        }
+    }
 
     public String format(LogRecord logRecord) {
-        LogRecord cloned = LoggingUtils.cloneRecordWithoutException(logRecord);
-        return formatter.format(cloned);
+        LogRecord recordToPublish = logRecord;
+        if (suppressExceptions) {
+            recordToPublish = LoggingUtils.cloneRecordWithoutException(logRecord);
+        }
+        return formatter.format(recordToPublish);
     }
 
     @SuppressWarnings("unused")

core/src/main/java/oracle/weblogic/deploy/logging/WLSDeployLoggingConfig.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022, Oracle Corporation and/or its affiliates.
+ * Copyright (c) 2017, 2023, Oracle and/or its affiliates.
  * Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
  */
 package oracle.weblogic.deploy.logging;
@@ -37,7 +37,7 @@ public class WLSDeployLoggingConfig {
     private static final String HANDLERS_PROP = "handlers";
     private static final String CONFIG_PROP = "config";
 
-    private static final String WLSDEPLOY_STDOUT_CONSOLE_HANDLER =
+    /* package */ static final String WLSDEPLOY_STDOUT_CONSOLE_HANDLER =
         "oracle.weblogic.deploy.logging.StdoutHandler";
     private static final String WLSDEPLOY_STDERR_CONSOLE_HANDLER =
         "oracle.weblogic.deploy.logging.StderrHandler";
@@ -52,7 +52,7 @@ public class WLSDeployLoggingConfig {
         FILE_HANDLER
     ));
 
-    private static final String HANDLER_LEVEL_PROP = ".level";
+    /* package */ static final String HANDLER_LEVEL_PROP = ".level";
     private static final String HANDLER_FILTER_PROP = ".filter";
     private static final String HANDLER_FORMATTER_PROP = ".formatter";
     private static final String HANDLER_PATTERN_PROP = ".pattern";

pom.xml

@@ -104,7 +104,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>32.1.3-jre</version>
+                <version>33.0.0-jre</version>
             </dependency>
             <dependency>
                 <groupId>javax.xml.bind</groupId>
@@ -135,7 +135,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.12.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>