Skip to content

[OpenTelemetry] Model changes to allow OpenTelemetry context propagation#36962

Open
stankiewicz wants to merge 3 commits intoapache:masterfrom
stankiewicz:model
Open

[OpenTelemetry] Model changes to allow OpenTelemetry context propagation#36962
stankiewicz wants to merge 3 commits intoapache:masterfrom
stankiewicz:model

Conversation

@stankiewicz
Copy link
Copy Markdown
Contributor

@stankiewicz stankiewicz commented Dec 2, 2025

Changes:

  • dependencies definitions to otel
  • WindowedValue interface change to expose context for propagation - context is not read by user
  • changes are behind external_metadata experiment

Next PRs:

  • propagation to windmill sink
  • reading from windmill reader
  • enabling default otel implementation for dataflow runner (v1 with propagation, v2 no propagation yet)

Thank you for your contribution! Follow this checklist to help us incorporate your contribution quickly and easily:

  • Mention the appropriate issue in your description (for example: addresses #123), if applicable. This will automatically add a link to the pull request in the issue. If you would like the issue to automatically close on merging the pull request, comment fixes #<ISSUE NUMBER> instead.
  • Update CHANGES.md with noteworthy changes.
  • If this contribution is large, please file an Apache Individual Contributor License Agreement.

See the Contributor Guide for more tips on how to make review process smoother.

To check the build health, please visit https://github.com/apache/beam/blob/master/.test-infra/BUILD_STATUS.md

GitHub Actions Tests Status (on master branch)

Build python source distribution and wheels
Python tests
Java tests
Go tests

See CI.md for more information about GitHub Actions CI or the workflows README to see a list of phrases to trigger workflows.

@stankiewicz
Copy link
Copy Markdown
Contributor Author

R: @sjvanrossum

@gemini-code-assist
Copy link
Copy Markdown
Contributor

Summary of Changes

Hello @stankiewicz, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request lays the foundational groundwork for integrating OpenTelemetry context propagation within Apache Beam. It involves updating OpenTelemetry dependencies, extending the internal data model (beam_fn_api.proto and WindowedValue interface) to carry trace context information, and implementing the necessary serialization/deserialization logic. These changes are part of an ongoing effort to enhance observability by enabling end-to-end distributed tracing across Beam pipelines, currently under an experimental flag.

Highlights

  • OpenTelemetry Dependency Updates: Updated and added several OpenTelemetry dependencies in BeamModulePlugin.groovy and various build.gradle files to support OpenTelemetry context propagation.
  • Protocol Buffer Extension for Trace Context: Modified beam_fn_api.proto to include traceparent and tracestate fields within the ElementMetadata message, enabling the serialization of W3C Trace Context.
  • WindowedValue Interface Enhancement: Extended the WindowedValue interface and its implementations to include a getContext() method, allowing the OpenTelemetry Context to be associated with and propagated alongside data elements.
  • OpenTelemetry Context Serialization: Introduced OpenTelemetryContextSerializer to handle the encoding and decoding of OpenTelemetry Context objects into and from the ElementMetadata of WindowedValue using the W3C Trace Context Propagator.
  • Experimental Feature: These changes are implemented behind an external_metadata experiment flag, indicating an incremental rollout and testing approach.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Dec 2, 2025

Stopping reviewer notifications for this pull request: review requested by someone other than the bot, ceding control. If you'd like to restart, comment assign set of reviewers

@stankiewicz
Copy link
Copy Markdown
Contributor Author

/gemini review

Copy link
Copy Markdown
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

The pull request effectively integrates OpenTelemetry context propagation into Apache Beam's core data structures and serialization mechanisms. This foundational change is well-implemented across various files, ensuring the Context is carried alongside WindowedValue elements. Key aspects include updating dependencies, extending the protocol buffer schema for traceparent and tracestate, modifying core WindowedValue interfaces and implementations to include the Context, and implementing robust serialization/deserialization logic via OpenTelemetryContextSerializer. The addition of a test case in WindowedValueTest.java validates the new functionality. The use of null for getContext() in specific overrides is consistent with the stated scope that the context is not yet consumed by users. Overall, this is a solid and necessary step towards comprehensive OpenTelemetry integration.

@stankiewicz stankiewicz force-pushed the model branch 2 times, most recently from 7be5980 to 69f9591 Compare December 5, 2025 21:46
@github-actions github-actions bot removed the model label Dec 5, 2025
@stankiewicz stankiewicz force-pushed the model branch 2 times, most recently from 9c7ed81 to 43f92ec Compare December 8, 2025 14:40
opentelemetry_api : "io.opentelemetry:opentelemetry-api", // google_cloud_platform_libraries_bom sets version
opentelemetry_api : "io.opentelemetry:opentelemetry-api:$opentelemetry_version",
opentelemetry_bom : "io.opentelemetry:opentelemetry-bom-alpha:$opentelemetry_version-alpha", // alpha required by extensions
opentelemetry_context : "io.opentelemetry:opentelemetry-context:$opentelemetry_version",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Will this change conflict with the GCP BOM? @suztomo do you think this is fine? We might just need to check them together manually.

}

public static Context read(BeamFnApi.Elements.ElementMetadata from) {
return W3CTraceContextPropagator.getInstance().extract(Context.root(), from, GETTER);
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

OK... this way of doing things matches https://opentelemetry.io/docs/specs/otel/context/api-propagators/

But it does seem like a complicated way of doing the equivalent of

W3TraceContextPropagator.getInstance().setTracestate(elementMetadata.getTracestate());
W3TraceContextPropagator.getInstance().setTraceparent(elementMetadata.getTraceparent());

and

elementMetadataBuilder.setTracestate(W3TraceContextPropagator.getInstance().getTracestate());
elementMetadataBuilder.setTraceparent(W3TraceContextPropagator.getInstance().getTraceparent());

Other nit: did we not agree that the ElementMetadata object should be only implementation detail? This class and everything should be private since it is just for encoding/decoding utility. But potentially also you want to do the SETTER on an Builder and the GETTER on a WindowedValue. If it is implementation detail, hidden, then I don't care that much, but if it is public then we have to be careful about what classes we use.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, but I don't want to reimplement W3CTraceContextPropagator to have getTraceState /getTraceParent methods.

On nits - ValueInSingleWindow is not implementing WindowedValue interface now. Once it will, I can improve that.
Setter has builder already.

@stankiewicz stankiewicz force-pushed the model branch 2 times, most recently from a0171cc to 3afc30b Compare December 23, 2025 17:57
@stankiewicz stankiewicz force-pushed the model branch 2 times, most recently from 4de3025 to 329eef6 Compare December 29, 2025 09:32
@github-actions github-actions bot added the io label Dec 29, 2025
@github-actions
Copy link
Copy Markdown
Contributor

This pull request has been marked as stale due to 60 days of inactivity. It will be closed in 1 week if no further activity occurs. If you think that’s incorrect or this pull request requires a review, please simply write any comment. If closed, you can revive the PR at any time and @mention a reviewer or discuss it on the dev@beam.apache.org list. Thank you for your contributions.

@github-actions github-actions bot added the stale label Feb 27, 2026
@stankiewicz
Copy link
Copy Markdown
Contributor Author

need to resolve conflicts and it will be ready soon.

@stankiewicz
Copy link
Copy Markdown
Contributor Author

Run Java_IOs_Direct PreCommit

@stankiewicz
Copy link
Copy Markdown
Contributor Author

Run Java PreCommit

@stankiewicz stankiewicz force-pushed the model branch 3 times, most recently from 33b239d to 6ab05e2 Compare March 11, 2026 10:46
@github-actions github-actions bot added the core label Mar 11, 2026
@stankiewicz
Copy link
Copy Markdown
Contributor Author

Run Java PreCommit

Copy link
Copy Markdown
Contributor

@sjvanrossum sjvanrossum left a comment

Choose a reason for hiding this comment

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

Minor feedback, LGTM overall.

Comment on lines +860 to +866
opentelemetry_api : "io.opentelemetry:opentelemetry-api:$opentelemetry_sdk_version",
opentelemetry_bom : "io.opentelemetry:opentelemetry-bom-alpha:$opentelemetry_sdk_version-alpha", // alpha required by extensions
opentelemetry_context : "io.opentelemetry:opentelemetry-context:$opentelemetry_sdk_version",
opentelemetry_gcp_auth : "io.opentelemetry.contrib:opentelemetry-gcp-auth-extension:$opentelemetry_contrib_version-alpha",
opentelemetry_sdk : "io.opentelemetry:opentelemetry-sdk:$opentelemetry_sdk_version",
opentelemetry_exporter_otlp : "io.opentelemetry:opentelemetry-exporter-otlp:$opentelemetry_sdk_version",
opentelemetry_extension_autoconfigure : "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:$opentelemetry_sdk_version",
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.

GCP BOM sets OpenTelemetry SDK version iirc:

Suggested change
opentelemetry_api : "io.opentelemetry:opentelemetry-api:$opentelemetry_sdk_version",
opentelemetry_bom : "io.opentelemetry:opentelemetry-bom-alpha:$opentelemetry_sdk_version-alpha", // alpha required by extensions
opentelemetry_context : "io.opentelemetry:opentelemetry-context:$opentelemetry_sdk_version",
opentelemetry_gcp_auth : "io.opentelemetry.contrib:opentelemetry-gcp-auth-extension:$opentelemetry_contrib_version-alpha",
opentelemetry_sdk : "io.opentelemetry:opentelemetry-sdk:$opentelemetry_sdk_version",
opentelemetry_exporter_otlp : "io.opentelemetry:opentelemetry-exporter-otlp:$opentelemetry_sdk_version",
opentelemetry_extension_autoconfigure : "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:$opentelemetry_sdk_version",
opentelemetry_api : "io.opentelemetry:opentelemetry-api", // google_cloud_platform_libraries_bom sets version
opentelemetry_bom : "io.opentelemetry:opentelemetry-bom-alpha:$opentelemetry_sdk_version-alpha", // alpha required by extensions
opentelemetry_context : "io.opentelemetry:opentelemetry-context", // google_cloud_platform_libraries_bom sets version
opentelemetry_gcp_auth : "io.opentelemetry.contrib:opentelemetry-gcp-auth-extension:$opentelemetry_contrib_version-alpha",
opentelemetry_sdk : "io.opentelemetry:opentelemetry-sdk", // google_cloud_platform_libraries_bom sets version
opentelemetry_exporter_otlp : "io.opentelemetry:opentelemetry-exporter-otlp", // google_cloud_platform_libraries_bom sets version
opentelemetry_extension_autoconfigure : "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure", // google_cloud_platform_libraries_bom sets version

BoundedWindow window = windowCoder.decode(inStream);
PaneInfo paneInfo = PaneInfo.PaneInfoCoder.INSTANCE.decode(inStream);
CausedByDrain causedByDrain = CausedByDrain.NORMAL;
io.opentelemetry.context.@Nullable Context openTelemetryContext = null;
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.

Suggested change
io.opentelemetry.context.@Nullable Context openTelemetryContext = null;
@Nullable io.opentelemetry.context.Context openTelemetryContext = null;

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

it's valid place for this annotation. It looks strange.

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.

As long as Spotless approves it's fine with me, but it seemed unconventional.
Fun party trick though, I didn't know this was syntactically allowed until I saw it pop up in this PR. 😄

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

It looks even weirder when it is an inner class (OuterClass.@Nullable InnerClass). Not only is it conventional, it is required. (there is no other valid syntax for this)

@stankiewicz stankiewicz changed the title [OpenTelemetry] Model changes to allow OpenTelemtry context propagation [OpenTelemetry] Model changes to allow OpenTelemetry context propagation Mar 12, 2026

class OpenTelemetryContextPropagator {

private static final TextMapSetter<BeamFnApi.Elements.ElementMetadata.Builder> SETTER =
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I feel like errorprone is going to tell you to make this a static method and use a method reference.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

it doesn't because TextMapSetter is custom interface. I will keep it as is, as Getter is not a lambda.

}
};

private static final TextMapGetter<BeamFnApi.Elements.ElementMetadata> GETTER =
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

ditto

BoundedWindow window = windowCoder.decode(inStream);
PaneInfo paneInfo = PaneInfo.PaneInfoCoder.INSTANCE.decode(inStream);
CausedByDrain causedByDrain = CausedByDrain.NORMAL;
io.opentelemetry.context.@Nullable Context openTelemetryContext = null;
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

It looks even weirder when it is an inner class (OuterClass.@Nullable InnerClass). Not only is it conventional, it is required. (there is no other valid syntax for this)

@stankiewicz stankiewicz force-pushed the model branch 2 times, most recently from f2dd0bc to ee77bb1 Compare March 24, 2026 18:17
@stankiewicz
Copy link
Copy Markdown
Contributor Author

Run Java PreCommit

@stankiewicz
Copy link
Copy Markdown
Contributor Author

Run Java_GCP_IO_Direct PreCommit

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants