(beam) branch master updated: [Dataflow Logging handler] Change @LazyInit to AtomicBoolean (#37846)

[scwhittle]

This is an automated email from the ASF dual-hosted git repository.

scwhittle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 487696c9fd1 [Dataflow Logging handler] Change @LazyInit to 
AtomicBoolean (#37846)
487696c9fd1 is described below

commit 487696c9fd1accad92194a6be93dd07f5fab57e5
Author: Arun Pandian <pandi...@google.com>
AuthorDate: Mon Mar 16 04:41:58 2026 -0700

    [Dataflow Logging handler] Change @LazyInit to AtomicBoolean (#37846)
---
 .../dataflow/worker/logging/DataflowWorkerLoggingHandler.java    | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingHandler.java
 
b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingHandler.java
index e81c277c7d7..68457799d90 100644
--- 
a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingHandler.java
+++ 
b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingHandler.java
@@ -42,7 +42,6 @@ import com.google.cloud.logging.Severity;
 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;
@@ -146,7 +145,7 @@ public class DataflowWorkerLoggingHandler extends Handler {
   }
 
   /** 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 {
@@ -248,7 +247,7 @@ public class DataflowWorkerLoggingHandler extends Handler {
   }
 
   public void setLogMdc(boolean enabled) {
-    logCustomMdc = enabled;
+    logCustomMdc.set(enabled);
   }
 
   private static Pair<ImmutableMap<String, String>, ImmutableMap<String, 
String>>
@@ -355,7 +354,7 @@ public class DataflowWorkerLoggingHandler extends Handler {
     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 =
@@ -606,7 +605,7 @@ public class DataflowWorkerLoggingHandler extends Handler {
       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");