Skip to content

[Dataflow Java] Fix incorrect warning log when specifying logger override #39034

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 1 commit into from
Jun 19, 2026
Merged

[Dataflow Java] Fix incorrect warning log when specifying logger override #39034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 5 additions & 7 deletions ...ava/org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,17 +217,16 @@ private static void applyOverridesToLogger(
boolean directLoggingEnabled) {
if (!directLoggingEnabled) {
logger.setLevel(overrides.disk);
if (overrides.disk.intValue() != Level.OFF.intValue()) {
if (overrides.direct.intValue() != Level.OFF.intValue()) {

@gemini-code-assist gemini-code-assist Bot Jun 19, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

To prevent a potential NullPointerException, consider adding a null check for overrides.direct before calling intValue() on it, especially if the direct logging override can be undefined or null.

Suggested change
if (overrides.direct.intValue() != Level.OFF.intValue()) {
if (overrides.direct != null && overrides.direct.intValue() != Level.OFF.intValue()) {

LOG.warn(
"Ignoring the disk logging level override for {} because --defaultWorkerDirectLoggerLevel was OFF.",
"Ignoring the direct logging level override for {} because --defaultWorkerDirectLoggerLevel was OFF.",
logger.getName());
}
return;
}

// Configure the logger to accept logs of the lower value. The log will be sent directly based
// upon the default
// nonDirectLogLevel or the provided hint.
// upon the default nonDirectLogLevel or the provided hint.
if (overrides.direct.intValue() < overrides.disk.intValue()) {
logger.setLevel(overrides.direct);
if (overrides.disk.intValue() != defaultNonDirectLogLevel.intValue()) {
Expand All @@ -245,9 +244,8 @@ private static void applyOverridesToLogger(
logger.setLevel(overrides.disk);
if (overrides.disk.intValue() < defaultNonDirectLogLevel.intValue()) {
// We need to provide the hint as otherwise the default would be used and send the log
// directly which is not
// desired. We don't bother if the threshold was increased as the right decision would still
// be made.
// directly which is not desired. We don't bother if the threshold was increased as the
// right decision would still be made.
logger.setResourceBundle(
DataflowWorkerLoggingHandler.resourceBundleForNonDirectLogLevelHint(overrides.disk));
}
Expand Down
44 changes: 42 additions & 2 deletions ...org/apache/beam/runners/dataflow/worker/logging/DataflowWorkerLoggingInitializerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public void testWithSdkHarnessConfigurationOverride() {
}

@Test
public void testWithWorkerCustomLogLevels() {
public void testWithWorkerCustomLogLevels() throws IOException {
DataflowWorkerLoggingOptions options =
PipelineOptionsFactory.as(DataflowWorkerLoggingOptions.class);
options.setWorkerLogLevelOverrides(
Expand All @@ -153,6 +153,9 @@ public void testWithWorkerCustomLogLevels() {
assertEquals(Level.SEVERE, bLogger.getLevel());
assertEquals(0, bLogger.getHandlers().length);
assertTrue(aLogger.getUseParentHandlers());

List<String> logLines = retrieveLogLines();
assertThat(logLines, not(hasItem(containsString("Ignoring the direct logging level"))));
}

@Test
Expand All @@ -176,7 +179,7 @@ public void testWithDirectLogging() {
}

@Test
public void testWithSdkHarnessCustomLogLevels() {
public void testWithSdkHarnessCustomLogLevels() throws IOException {
SdkHarnessOptions options = PipelineOptionsFactory.as(SdkHarnessOptions.class);
options.setSdkHarnessLogLevelOverrides(
new SdkHarnessLogLevelOverrides()
Expand All @@ -194,6 +197,43 @@ public void testWithSdkHarnessCustomLogLevels() {
assertEquals(Level.SEVERE, bLogger.getLevel());
assertEquals(0, bLogger.getHandlers().length);
assertTrue(aLogger.getUseParentHandlers());

List<String> logLines = retrieveLogLines();
assertThat(logLines, not(hasItem(containsString("Ignoring the direct logging level"))));
}

@Test
public void testWithSdkHarnessCustomLogLevels_DirectSpecifiedNotEnabled() throws IOException {
SdkHarnessOptions options = PipelineOptionsFactory.as(SdkHarnessOptions.class);
options.setSdkHarnessLogLevelOverrides(
new SdkHarnessLogLevelOverrides()
.addOverrideForName("B", SdkHarnessOptions.LogLevel.DEBUG)
.addOverrideForName("C", SdkHarnessOptions.LogLevel.ERROR));
DataflowWorkerLoggingOptions loggingOptions = options.as(DataflowWorkerLoggingOptions.class);
loggingOptions.setWorkerDirectLogLevelOverrides(
new WorkerLogLevelOverrides()
.addOverrideForName("A", DataflowWorkerLoggingOptions.Level.TRACE)
.addOverrideForName("C", DataflowWorkerLoggingOptions.Level.TRACE));

DataflowWorkerLoggingInitializer.configure(options.as(DataflowWorkerLoggingOptions.class));

Logger aLogger = LogManager.getLogManager().getLogger("A");
assertEquals(0, aLogger.getHandlers().length);
assertEquals(Level.INFO, aLogger.getLevel());
assertTrue(aLogger.getUseParentHandlers());

Logger bLogger = LogManager.getLogManager().getLogger("B");
assertEquals(Level.FINE, bLogger.getLevel());
assertEquals(0, bLogger.getHandlers().length);
assertTrue(aLogger.getUseParentHandlers());

Logger cLogger = LogManager.getLogManager().getLogger("C");
assertEquals(Level.SEVERE, cLogger.getLevel());
assertEquals(0, cLogger.getHandlers().length);
assertTrue(aLogger.getUseParentHandlers());

List<String> logLines = retrieveLogLines();
assertThat(logLines, hasItem(containsString("Ignoring the direct logging level")));
}

@Test
Expand Down
Loading