chore(batch): change default logging format for tests

Author: bevzzz

pom.xml

@@ -235,6 +235,13 @@
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
           <version>3.5.4</version>
+          <configuration>
+            <systemPropertyVariables>
+              <java.util.logging.config.file>
+                ${project.basedir}/src/test/resources/logging.properties
+              </java.util.logging.config.file>
+            </systemPropertyVariables>
+          </configuration>
         </plugin>
         <plugin>
           <groupId>org.projectlombok</groupId>
@@ -537,12 +544,4 @@
       </plugin>
     </plugins>
     </build>
-    <profiles>
-      <profile>
-        <id>debug</id>
-        <properties>
-          <argLine>-Djava.util.logging.config.file=src/test/resources/logging.properties</argLine>
-        </properties>
-      </profile>
-    </profiles>
 </project>

src/main/java/io/weaviate/client6/v1/api/collections/batch/BatchContext.java

@@ -826,7 +826,7 @@ private void onAcks(Event.Acks acks) {
       log.atInfo()
           .addKeyValue("count_acks", acks.acked().size())
           .addKeyValue("wip_tasks", wip::size)
-          .log("Received Results");
+          .log("Received Acks");
 
       Collection<String> removed = batch.clear();
       if (!acks.acked().containsAll(removed)) {
@@ -865,6 +865,10 @@ private void onBackoff(Event.Backoff backoff) {
     }
 
     private void onOom(Event.Oom oom) {
+      log.atInfo()
+          .addKeyValue("wip_tasks", wip::size)
+          .log("Server is out of memory");
+
       setState(new Oom(oom.delaySeconds()));
     }
 
@@ -915,22 +919,26 @@ public String toString() {
    * after which it will force stream termination by imitating server shutdown.
    */
   private final class Oom extends BaseState {
-    private final long delaySeconds;
+    private final long shutdownAfterSeconds;
     private ScheduledFuture<?> shutdown;
 
-    private Oom(long delaySeconds) {
+    private Oom(long shutdownAfterSeconds) {
       super("OOM");
-      this.delaySeconds = delaySeconds;
+      this.shutdownAfterSeconds = shutdownAfterSeconds;
+
+      log.atDebug()
+          .addKeyValue("grace_period", shutdownAfterSeconds)
+          .log("Server is out of memory");
     }
 
     @Override
     public void onEnter(State prev) {
-      shutdown = scheduledService.schedule(this::initiateShutdown, delaySeconds, TimeUnit.SECONDS);
+      shutdown = scheduledService.schedule(this::initiateShutdown, shutdownAfterSeconds, TimeUnit.SECONDS);
     }
 
     /** Imitate server shutdown sequence. */
     private void initiateShutdown() {
-      log.info("No update from the server after {}s, context will be forcibly restarted", delaySeconds);
+      log.info("No update from the server after {}s, context will be forcibly restarted", shutdownAfterSeconds);
 
       // We cannot route event handling via normal BatchContext#onEvent, because
       // it delegates to the current state, which is Oom. If Oom#onEvent were to
@@ -985,7 +993,7 @@ private ServerShuttingDown(State prev) {
       log.atDebug()
           .addKeyValue("prev_state", prev)
           .addKeyValue("can_prepare_next", canPrepareNext)
-          .log("Server shutting down");
+          .log("Server is shutting down");
     }
 
     @Override
@@ -1051,9 +1059,7 @@ public void onEvent(Event event) {
       assert retries <= maxRetries : "maxRetries exceeded";
 
       if (event == Event.STARTED) {
-        log.atInfo()
-            .addArgument(retries)
-            .log("Reconnected after {} retries");
+        log.info("Reconnected after {} retries", retries);
 
         setState(ACTIVE);
       } else if (event instanceof Event.StreamHangup) {

src/test/java/io/weaviate/client6/v1/api/collections/batch/BatchContextTest.java

@@ -32,7 +32,7 @@
 import io.weaviate.client6.v1.internal.orm.CollectionDescriptor;
 
 public class BatchContextTest {
-  private static final Logger log = LoggerFactory.getLogger(BatchContext.class);
+  private static final Logger log = LoggerFactory.getLogger(BatchContextTest.class);
 
   private static final CollectionDescriptor<Map<String, Object>> DESCRIPTOR = CollectionDescriptor
       .ofMap("BatchContextTest");
@@ -141,7 +141,7 @@ public void reset() throws Exception {
 
     REQUEST_QUEUE.clear();
 
-    log.debug("==================================================");
+    log.debug("===================closeContext==================");
   }
 
   private static final WeaviateProtoBatch.BatchStreamRequest.MessageCase START = WeaviateProtoBatch.BatchStreamRequest.MessageCase.START;

src/test/resources/logging.properties

@@ -1,4 +1,9 @@
 .level=INFO
+
 handlers=java.util.logging.ConsoleHandler
-java.util.logging.ConsoleHandler.level=FINE
+java.util.logging.ConsoleHandler.level=FINEST
+java.util.logging.ConsoleHandler.formatter=java.util.logging.SimpleFormatter
+java.util.logging.SimpleFormatter.format=[%4$s] %1$tH:%1$tM:%1$tS.%1$tL %5$s%n
+
 io.weaviate.client6.level=FINE
+io.weaviate.client6.v1.api.collections.batch.BatchContextTest.level=FINEST