From ae11be5988b385c386abfb0f2d8162a42541b16e Mon Sep 17 00:00:00 2001 From: Radek Stankiewicz Date: Tue, 9 Jun 2026 15:47:15 +0200 Subject: [PATCH 1/2] turn off gcp otel auth extension by default. --- .../beam/runners/dataflow/worker/StreamingDataflowWorker.java | 4 ++++ .../src/main/java/org/apache/beam/fn/harness/FnHarness.java | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java index 9e82343474c6..72871fec4629 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java @@ -1059,6 +1059,10 @@ public static void main(String[] args) throws Exception { } }); LOG.info("Enabled Open Telemetry with properties: {}", openTelemetryProperties); + } else { + // turn off auth extension so it doesn't interfere if user is configuring otel e.g. via + // JvmInitializer. + System.setProperty("google.otel.auth.target.signals", "none"); } LOG.debug("Creating StreamingDataflowWorker from options: {}", options); diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java index 703e726739a0..0e8f459a1f16 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java @@ -306,6 +306,10 @@ public static void main( } }); LOG.info("Enabled Open Telemetry with properties: {}", openTelemetryProperties); + } else { + // turn off auth extension so it doesn't interfere if user is configuring otel e.g. via + // JvmInitializer. + System.setProperty("google.otel.auth.target.signals", "none"); } EnumMap< BeamFnApi.InstructionRequest.RequestCase, From d388a9d9c516d709713bc3e5ef282aa930030b72 Mon Sep 17 00:00:00 2001 From: Radek Stankiewicz Date: Tue, 23 Jun 2026 20:48:37 -0400 Subject: [PATCH 2/2] Address comments --- .../beam/runners/dataflow/worker/StreamingDataflowWorker.java | 4 +++- .../src/main/java/org/apache/beam/fn/harness/FnHarness.java | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java index 72871fec4629..0695e324becf 100644 --- a/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java +++ b/runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java @@ -1062,7 +1062,9 @@ public static void main(String[] args) throws Exception { } else { // turn off auth extension so it doesn't interfere if user is configuring otel e.g. via // JvmInitializer. - System.setProperty("google.otel.auth.target.signals", "none"); + if (System.getProperty("google.otel.auth.target.signals") == null) { + System.setProperty("google.otel.auth.target.signals", "none"); + } } LOG.debug("Creating StreamingDataflowWorker from options: {}", options); diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java index 0e8f459a1f16..8cbcaf5d865a 100644 --- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java +++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java @@ -309,7 +309,9 @@ public static void main( } else { // turn off auth extension so it doesn't interfere if user is configuring otel e.g. via // JvmInitializer. - System.setProperty("google.otel.auth.target.signals", "none"); + if (System.getProperty("google.otel.auth.target.signals") == null) { + System.setProperty("google.otel.auth.target.signals", "none"); + } } EnumMap< BeamFnApi.InstructionRequest.RequestCase,