Skip to content

[Logs 5] Use a separate ExecutorService for log batching #4379

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adinauer merged 6 commits into from
May 13, 2025
Merged

[Logs 5] Use a separate ExecutorService for log batching #4379

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0627186
Add Log feature to Java SDK
adinauer May 6, 2025
27a24ec
Rate limit for log items
adinauer May 6, 2025
0c75319
Add options for logs
adinauer May 7, 2025
bc8caf7
Add batch processor for logs
adinauer May 8, 2025
38c3dcd
Use a separate ExecutorService for log batching
adinauer May 8, 2025
0d007b2
Merge branch 'main' into feat/log-batching-separate-executor-service
adinauer May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion sentry/src/main/java/io/sentry/logger/LoggerBatchProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package io.sentry.logger;

import io.sentry.ISentryClient;
import io.sentry.ISentryExecutorService;
import io.sentry.ISentryLifecycleToken;
import io.sentry.SentryExecutorService;
import io.sentry.SentryLogEvent;
import io.sentry.SentryLogEvents;
import io.sentry.SentryOptions;
Expand All @@ -22,6 +24,7 @@ public final class LoggerBatchProcessor implements ILoggerBatchProcessor {
private final @NotNull SentryOptions options;
private final @NotNull ISentryClient client;
private final @NotNull Queue<SentryLogEvent> queue;
private final @NotNull ISentryExecutorService executorService;
private volatile @Nullable Future<?> scheduledFlush;
private static final @NotNull AutoClosableReentrantLock scheduleLock =
new AutoClosableReentrantLock();
Expand All @@ -31,6 +34,7 @@ public LoggerBatchProcessor(
this.options = options;
this.client = client;
this.queue = new ConcurrentLinkedQueue<>();
this.executorService = new SentryExecutorService();
}

@Override
Expand All @@ -39,11 +43,14 @@ public void add(final @NotNull SentryLogEvent logEvent) {
maybeSchedule(false, false);
}

@SuppressWarnings("FutureReturnValueIgnored")
@Override
public void close(final boolean isRestarting) {
if (isRestarting) {
maybeSchedule(true, true);
executorService.submit(() -> executorService.close(options.getShutdownTimeoutMillis()));
} else {
executorService.close(options.getShutdownTimeoutMillis());
while (!queue.isEmpty()) {
flushBatch();
}
Expand All @@ -58,7 +65,7 @@ private void maybeSchedule(boolean forceSchedule, boolean immediately) {
|| latestScheduledFlush.isDone()
|| latestScheduledFlush.isCancelled()) {
final int flushAfterMs = immediately ? 0 : FLUSH_AFTER_MS;
scheduledFlush = options.getExecutorService().schedule(new BatchRunnable(), flushAfterMs);
scheduledFlush = executorService.schedule(new BatchRunnable(), flushAfterMs);
}
}
}
Expand Down
Loading