Skip to content

[OpenTelemetry] set default otel.service.instance.id #40353

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
stankiewicz merged 1 commit into from
Oct 12, 2026
Merged

[OpenTelemetry] set default otel.service.instance.id #40353

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
18 changes: 1 addition & 17 deletions ...worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,23 +1082,7 @@ public static void main(String[] args) throws Exception {
WindowedValues.FullWindowedValueCoder.setMetadataSupported();
}

SdkHarnessOptions sdkHarnessOptions = options.as(SdkHarnessOptions.class);
Map<String, String> openTelemetryProperties = sdkHarnessOptions.getOpenTelemetryProperties();
if (openTelemetryProperties != null && !openTelemetryProperties.isEmpty()) {
openTelemetryProperties.forEach(
(k, v) -> {
if (k != null && v != null) {
System.setProperty(k, v);
}
});
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.
if (System.getProperty("google.otel.auth.target.signals") == null) {
System.setProperty("google.otel.auth.target.signals", "none");
}
}
SdkHarnessOptions.configureOpenTelemetry(options);

LOG.debug("Creating StreamingDataflowWorker from options: {}", options);
StreamingDataflowWorker worker = StreamingDataflowWorker.fromOptions(options);
Expand Down
24 changes: 24 additions & 0 deletions sdks/java/core/src/main/java/org/apache/beam/sdk/options/SdkHarnessOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.logging.Level;
import java.util.logging.LogManager;
import java.util.logging.Logger;
Expand Down Expand Up @@ -475,6 +476,29 @@ public Duration create(PipelineOptions options) {

void setOpenTelemetryProperties(Map<String, String> value);

static void configureOpenTelemetry(PipelineOptions options) {
SdkHarnessOptions sdkHarnessOptions = options.as(SdkHarnessOptions.class);
Map<String, String> openTelemetryProperties = sdkHarnessOptions.getOpenTelemetryProperties();
if (openTelemetryProperties != null && !openTelemetryProperties.isEmpty()) {
openTelemetryProperties.forEach(
(k, v) -> {
if (k != null && v != null) {
System.setProperty(k, v);
}
});
if (System.getProperty("otel.service.instance.id") == null) {
String instanceId = UUID.randomUUID().toString();
System.setProperty("otel.service.instance.id", instanceId);
}
} else {
// turn off auth extension so it doesn't interfere if user is configuring otel e.g. via
// JvmInitializer.
if (System.getProperty("google.otel.auth.target.signals") == null) {
System.setProperty("google.otel.auth.target.signals", "none");
}
}
}

@JsonIgnore
@Hidden
@Default.InstanceFactory(GlobalOpenTelemetryFactory.class)
Expand Down
18 changes: 1 addition & 17 deletions sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnHarness.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,23 +305,7 @@ public static void main(
// Register standard file systems.
FileSystems.setDefaultPipelineOptions(options);
CoderTranslation.verifyModelCodersRegistered();
SdkHarnessOptions sdkHarnessOptions = options.as(SdkHarnessOptions.class);
Map<String, String> openTelemetryProperties = sdkHarnessOptions.getOpenTelemetryProperties();
if (openTelemetryProperties != null && !openTelemetryProperties.isEmpty()) {
openTelemetryProperties.forEach(
(k, v) -> {
if (k != null && v != null) {
System.setProperty(k, v);
}
});
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.
if (System.getProperty("google.otel.auth.target.signals") == null) {
System.setProperty("google.otel.auth.target.signals", "none");
}
}
SdkHarnessOptions.configureOpenTelemetry(options);
EnumMap<
BeamFnApi.InstructionRequest.RequestCase,
ThrowingFunction<InstructionRequest, BeamFnApi.InstructionResponse.Builder>>
Expand Down
Loading