Fix: Fix Appender default flushlevel to be consistent with java-logging (#1441)

* Fix: Fix Appender default flushlevel to be consistent with java-logging

* fix easymock expectation failure

Author: cindy-peng

README.md

@@ -89,7 +89,7 @@ See [Logback filters](https://logback.qos.ch/manual/filters.html#thresholdFilter
     <!-- Optional: defaults to "java.log" -->
     <log>application.log</log>
 
-    <!-- Optional: defaults to "ERROR" -->
+    <!-- Optional: defaults to "OFF" -->
     <flushLevel>WARN</flushLevel>
 
     <!-- Optional: defaults to ASYNC -->

samples/pom.xml

@@ -13,7 +13,7 @@
 
   <!--
     The parent pom defines common style checks and testing strategies for our samples.
-    Removing or replacing it should not affect the execution of the samples in anyway.
+    Removing or replacing it should not affect the execution of the samples in any way.
   -->
   <parent>
     <groupId>com.google.cloud.samples</groupId>

src/main/java/com/google/cloud/logging/logback/LoggingAppender.java

@@ -62,7 +62,7 @@
  *         <!-- Optional: defaults to {@code "java.log"} -->
  *         <log>application.log</log>
  *
- *         <!-- Optional: defaults to {@code "ERROR"} -->
+ *         <!-- Optional: defaults to {@code "OFF"} -->
  *         <flushLevel>WARN</flushLevel>
  *
  *         <!-- Optional: defaults to {@code ASYNC} -->
@@ -150,7 +150,7 @@ public class LoggingAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {
   /**
    * Sets a threshold for log severity level to flush all log entries that were batched so far.
    *
-   * <p>Defaults to Error.
+   * <p>Defaults to OFF.
    *
    * @param flushLevel Logback log level
    */
@@ -298,7 +298,7 @@ void setupMonitoredResource(MonitoredResource monitoredResource) {
   }
 
   private Level getFlushLevel() {
-    return (flushLevel != null) ? flushLevel : Level.ERROR;
+    return (flushLevel != null) ? flushLevel : Level.OFF;
   }
 
   private String getLogName() {

src/test/java/com/google/cloud/logging/logback/LoggingAppenderTest.java

@@ -193,9 +193,15 @@ public void testFlushLevelConfigSupportsFlushLevelOff() {
     assertThat(foundSeverity).isEqualTo(null);
   }
 
+  @Test
+  public void testDefaultFlushLevelOff() {
+    loggingAppender.start();
+    Severity foundSeverity = logging.getFlushSeverity();
+    assertThat(foundSeverity).isEqualTo(null);
+  }
+
   @Test
   public void testFilterLogsOnlyLogsAtOrAboveLogLevel() {
-    logging.setFlushSeverity(Severity.ERROR);
     Capture<Iterable<LogEntry>> capturedArgument = Capture.newInstance();
     logging.write(
         capture(capturedArgument),
@@ -223,7 +229,6 @@ public void testFilterLogsOnlyLogsAtOrAboveLogLevel() {
 
   @Test
   public void testPartialSuccessOverrideHasExpectedValue() {
-    logging.setFlushSeverity(Severity.ERROR);
     Capture<WriteOption> logNameArg = Capture.newInstance();
     Capture<WriteOption> resourceArg = Capture.newInstance();
     Capture<WriteOption> partialSuccessArg = Capture.newInstance();
@@ -247,7 +252,6 @@ public void testPartialSuccessOverrideHasExpectedValue() {
 
   @Test
   public void testDefaultWriteOptionsHasExpectedDefaults() {
-    logging.setFlushSeverity(Severity.ERROR);
     Capture<WriteOption> partialSuccessArg = Capture.newInstance();
     logging.write(
         EasyMock.<Iterable<LogEntry>>anyObject(),
@@ -266,7 +270,6 @@ public void testDefaultWriteOptionsHasExpectedDefaults() {
 
   @Test
   public void testMdcValuesAreConvertedToLabels() {
-    logging.setFlushSeverity(Severity.ERROR);
     Capture<Iterable<LogEntry>> capturedArgument = Capture.newInstance();
     logging.write(
         capture(capturedArgument),
@@ -325,7 +328,6 @@ public void testMdcValuesAreConvertedToLabelsWithPassingNullValues() {
     MDC.put("mdc1", "value1");
     MDC.put("mdc2", null);
     MDC.put("mdc3", "value3");
-    logging.setFlushSeverity(Severity.ERROR);
     Capture<Iterable<LogEntry>> capturedArgument = Capture.newInstance();
     logging.write(
         capture(capturedArgument),
@@ -351,7 +353,6 @@ public void testMdcValuesAreConvertedToLabelsWithPassingNullValues() {
   @Test
   public void testAddCustomLoggingEventEnhancers() {
     MDC.put("mdc1", "value1");
-    logging.setFlushSeverity(Severity.ERROR);
     Capture<Iterable<LogEntry>> capturedArgument = Capture.newInstance();
     logging.write(
         capture(capturedArgument),
@@ -375,7 +376,6 @@ public void testAddCustomLoggingEventEnhancers() {
 
   @Test
   public void testAddCustomLoggingEnhancer() {
-    logging.setFlushSeverity(Severity.ERROR);
     Capture<Iterable<LogEntry>> capturedArgument = Capture.newInstance();
     logging.write(
         capture(capturedArgument),
@@ -398,7 +398,6 @@ public void testAddCustomLoggingEnhancer() {
   @Test
   @SuppressWarnings("deprecation")
   public void testFlush() {
-    logging.setFlushSeverity(Severity.ERROR);
     logging.write(
         EasyMock.<Iterable<LogEntry>>anyObject(),
         anyObject(WriteOption.class),
@@ -419,7 +418,6 @@ public void testFlush() {
 
   @Test
   public void testAutoPopulationEnabled() {
-    logging.setFlushSeverity(Severity.ERROR);
     Capture<Iterable<LogEntry>> capturedLogEntries = Capture.newInstance();
     EasyMock.expect(
             logging.populateMetadata(
@@ -458,7 +456,6 @@ public void testAutoPopulationEnabled() {
 
   @Test
   public void testRedirectToStdoutEnabled() {
-    logging.setFlushSeverity(Severity.ERROR);
     EasyMock.expect(
             logging.populateMetadata(
                 EasyMock.<Iterable<LogEntry>>anyObject(),
@@ -503,7 +500,6 @@ public void testRedirectToStdoutDisabled() {
   public void testFDiagnosticInfoAdded() {
     LoggingAppender.setInstrumentationStatus(false);
     Capture<Iterable<LogEntry>> capturedArgument = Capture.newInstance();
-    logging.setFlushSeverity(Severity.ERROR);
     logging.write(
         capture(capturedArgument),
         anyObject(WriteOption.class),
@@ -547,7 +543,6 @@ public void testFDiagnosticInfoAdded() {
 
   @Test
   public void testFDiagnosticInfoNotAdded() {
-    logging.setFlushSeverity(Severity.ERROR);
     Capture<Iterable<LogEntry>> capturedArgument = Capture.newInstance();
     logging.write(
         capture(capturedArgument),

src/test/java/com/google/cloud/logging/logback/logback.xml

@@ -8,7 +8,7 @@
     <!-- Optional: defaults to "java.log" -->
     <log>application.log</log>
 
-    <!-- Optional: defaults to "ERROR" -->
+    <!-- Optional: defaults to "OFF" -->
     <flushLevel>WARN</flushLevel>
 
     <!-- Optional: defaults to ASYNC -->