Skip to content

[Dataflow Logging handler] Change @LazyInit to AtomicBoolean #37846

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
scwhittle merged 2 commits into from
Mar 16, 2026
+4 −5
Merged

[Dataflow Logging handler] Change @LazyInit to AtomicBoolean #37846

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4065d1
[Dataflow Logging handler] Change @LazyInit to AtomicBoolean
arunpandianp Mar 13, 2026
c12a5e2
make variable final
scwhittle Mar 16, 2026
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: 4 additions & 5 deletions ...in/java/org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
import com.google.cloud.logging.Synchronicity;
import com.google.common.collect.Iterables;
import com.google.common.collect.Iterators;
import com.google.errorprone.annotations.concurrent.LazyInit;
import com.google.protobuf.Struct;
import java.io.BufferedOutputStream;
import java.io.File;
Expand Down Expand Up @@ -146,7 +145,7 @@ static ResourceBundle resourceBundleForNonDirectLogLevelHint(Level nonDirectLogL
}

/** If true, add SLF4J MDC to custom_data of the log message. */
@LazyInit private boolean logCustomMdc = false;
private final AtomicBoolean logCustomMdc = new AtomicBoolean(false);

// Only instantiated and set if enableDirectLogging is called.
private static class DirectLoggingState {
Expand Down Expand Up @@ -248,7 +247,7 @@ public DataflowWorkerLoggingHandler(String filename, long sizeLimit) throws IOEx
}

public void setLogMdc(boolean enabled) {
logCustomMdc = enabled;
logCustomMdc.set(enabled);
}

private static Pair<ImmutableMap<String, String>, ImmutableMap<String, String>>
Expand Down Expand Up @@ -355,7 +354,7 @@ LogEntry constructDirectLogEntry(
addLogField(payloadBuilder, "worker", DataflowWorkerLoggingMDC.getWorkerId(), FIELD_MAX_LENGTH);
addLogField(payloadBuilder, "work", DataflowWorkerLoggingMDC.getWorkId(), FIELD_MAX_LENGTH);
addLogField(payloadBuilder, "job", DataflowWorkerLoggingMDC.getJobId(), FIELD_MAX_LENGTH);
if (logCustomMdc) {
if (logCustomMdc.get()) {
@Nullable Map<String, String> mdcMap = MDC.getCopyOfContextMap();
if (mdcMap != null && !mdcMap.isEmpty()) {
Struct.Builder customDataBuilder =
Expand Down Expand Up @@ -606,7 +605,7 @@ public synchronized void publishToDisk(
writeIfNotEmpty(generator, "work", DataflowWorkerLoggingMDC.getWorkId());
writeIfNotEmpty(generator, "logger", record.getLoggerName());
writeIfNotEmpty(generator, "exception", formatException(record.getThrown()));
if (logCustomMdc) {
if (logCustomMdc.get()) {
@Nullable Map<String, String> mdcMap = MDC.getCopyOfContextMap();
if (mdcMap != null && !mdcMap.isEmpty()) {
generator.writeFieldName("custom_data");
Expand Down
Loading