Merge 2f05276 into 72120ed

Author: adinauer

sentry/api/sentry.api

@@ -4817,6 +4817,7 @@ public abstract interface class io/sentry/logger/ILoggerApi {
 public abstract interface class io/sentry/logger/ILoggerBatchProcessor {
 	public abstract fun add (Lio/sentry/SentryLogEvent;)V
 	public abstract fun close (Z)V
+	public abstract fun flush (J)V
 }
 
 public final class io/sentry/logger/LoggerApi : io/sentry/logger/ILoggerApi {
@@ -4838,6 +4839,7 @@ public final class io/sentry/logger/LoggerBatchProcessor : io/sentry/logger/ILog
 	public fun <init> (Lio/sentry/SentryOptions;Lio/sentry/ISentryClient;)V
 	public fun add (Lio/sentry/SentryLogEvent;)V
 	public fun close (Z)V
+	public fun flush (J)V
 }
 
 public final class io/sentry/logger/NoOpLoggerApi : io/sentry/logger/ILoggerApi {
@@ -4856,6 +4858,7 @@ public final class io/sentry/logger/NoOpLoggerApi : io/sentry/logger/ILoggerApi
 public final class io/sentry/logger/NoOpLoggerBatchProcessor : io/sentry/logger/ILoggerBatchProcessor {
 	public fun add (Lio/sentry/SentryLogEvent;)V
 	public fun close (Z)V
+	public fun flush (J)V
 	public static fun getInstance ()Lio/sentry/logger/NoOpLoggerBatchProcessor;
 }
 

sentry/src/main/java/io/sentry/SentryClient.java

@@ -1544,6 +1544,7 @@ public void close(final boolean isRestarting) {
 
   @Override
   public void flush(final long timeoutMillis) {
+    loggerBatchProcessor.flush(timeoutMillis);
     transport.flush(timeoutMillis);
   }
 

sentry/src/main/java/io/sentry/logger/ILoggerBatchProcessor.java

@@ -7,4 +7,11 @@ public interface ILoggerBatchProcessor {
   void add(@NotNull SentryLogEvent event);
 
   void close(boolean isRestarting);
+
+  /**
+   * Flushes log events.
+   *
+   * @param timeoutMillis time in milliseconds
+   */
+  void flush(long timeoutMillis);
 }

sentry/src/main/java/io/sentry/logger/LoggerBatchProcessor.java

@@ -75,6 +75,11 @@ private void maybeSchedule(boolean forceSchedule, boolean immediately) {
     }
   }
 
+  @Override
+  public void flush(long timeoutMillis) {
+    maybeSchedule(true, true);
+  }
+
   private void flush() {
     flushInternal();
     try (final @NotNull ISentryLifecycleToken ignored = scheduleLock.acquire()) {

sentry/src/main/java/io/sentry/logger/NoOpLoggerBatchProcessor.java

@@ -24,4 +24,9 @@ public void add(@NotNull SentryLogEvent event) {
   public void close(final boolean isRestarting) {
     // do nothing
   }
+
+  @Override
+  public void flush(long timeoutMillis) {
+    // do nothing
+  }
 }