Merge 2f05276 into 72120ed

adinauer · web-flow · commit 8a2531017d8d · 2025-06-20T08:36:11.000+02:00
diff --git a/sentry/api/sentry.api b/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;
 }
 
diff --git a/sentry/src/main/java/io/sentry/SentryClient.java b/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);
   }
 
diff --git a/sentry/src/main/java/io/sentry/logger/ILoggerBatchProcessor.java b/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);
 }
diff --git a/sentry/src/main/java/io/sentry/logger/LoggerBatchProcessor.java b/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()) {
diff --git a/sentry/src/main/java/io/sentry/logger/NoOpLoggerBatchProcessor.java b/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
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -4817,6 +4817,7 @@ public abstract interface class io/sentry/logger/ILoggerApi {`
`4817`	`4817`	`public abstract interface class io/sentry/logger/ILoggerBatchProcessor {`
`4818`	`4818`	`public abstract fun add (Lio/sentry/SentryLogEvent;)V`
`4819`	`4819`	`public abstract fun close (Z)V`
	`4820`	`+ public abstract fun flush (J)V`
`4820`	`4821`	`}`
`4821`	`4822`
`4822`	`4823`	`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`
`4838`	`4839`	`public fun <init> (Lio/sentry/SentryOptions;Lio/sentry/ISentryClient;)V`
`4839`	`4840`	`public fun add (Lio/sentry/SentryLogEvent;)V`
`4840`	`4841`	`public fun close (Z)V`
	`4842`	`+ public fun flush (J)V`
`4841`	`4843`	`}`
`4842`	`4844`
`4843`	`4845`	`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`
`4856`	`4858`	`public final class io/sentry/logger/NoOpLoggerBatchProcessor : io/sentry/logger/ILoggerBatchProcessor {`
`4857`	`4859`	`public fun add (Lio/sentry/SentryLogEvent;)V`
`4858`	`4860`	`public fun close (Z)V`
	`4861`	`+ public fun flush (J)V`
`4859`	`4862`	`public static fun getInstance ()Lio/sentry/logger/NoOpLoggerBatchProcessor;`
`4860`	`4863`	`}`
`4861`	`4864`
Original file line number	Diff line number	Diff line change
`@@ -1544,6 +1544,7 @@ public void close(final boolean isRestarting) {`
`1544`	`1544`
`1545`	`1545`	`@Override`
`1546`	`1546`	`public void flush(final long timeoutMillis) {`
	`1547`	`+ loggerBatchProcessor.flush(timeoutMillis);`
`1547`	`1548`	`transport.flush(timeoutMillis);`
`1548`	`1549`	`}`
`1549`	`1550`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,11 @@ private void maybeSchedule(boolean forceSchedule, boolean immediately) {`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
	`78`	`+ @Override`
	`79`	`+ public void flush(long timeoutMillis) {`
	`80`	`+ maybeSchedule(true, true);`
	`81`	`+ }`
	`82`	`+`
`78`	`83`	`private void flush() {`
`79`	`84`	`flushInternal();`
`80`	`85`	`try (final @NotNull ISentryLifecycleToken ignored = scheduleLock.acquire()) {`
Original file line number	Diff line number	Diff line change
`@@ -24,4 +24,9 @@ public void add(@NotNull SentryLogEvent event) {`
`24`	`24`	`public void close(final boolean isRestarting) {`
`25`	`25`	`// do nothing`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+ @Override`
	`29`	`+ public void flush(long timeoutMillis) {`
	`30`	`+ // do nothing`
	`31`	`+ }`
`27`	`32`	`}`