-
Notifications
You must be signed in to change notification settings - Fork 4.5k
[#19711] Fix missing step_id in Python SDK worker logs during DoFn setup #37413
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.
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
base: master
Are you sure you want to change the base?
Conversation
Summary of ChangesHello @Tanishq1030, 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 resolves a critical logging issue in the Python SDK worker where Highlights
🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console. Using Gemini Code AssistThe 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
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 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
|
|
Assigning reviewers: R: @claudevdm for label python. Note: If you would like to opt out of this review, comment Available commands:
The PR bot will only process comments in the main thread (not review comments). |
|
Reminder, please take a look at this pr: @claudevdm |
|
Assigning new set of reviewers because Pr has gone too long without review. If you would like to opt out of this review, comment R: @tvalentyn for label python. Available commands:
|
| @@ -1091,6 +1091,7 @@ def __init__( | |||
| state_handler: sdk_worker.CachingStateHandler, | |||
| data_channel_factory: data_plane.DataChannelFactory, | |||
| data_sampler: Optional[data_sampler.DataSampler] = None, | |||
| instruction_id: Optional[str] = None, | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this be optional, or should we rather make it required?
| instruction_id = statesampler.get_current_instruction_id() | ||
| if instruction_id: | ||
| log_entry.instruction_id = instruction_id | ||
| if hasattr(record, 'instruction_id'): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can simplify/optimize by avoid hasattr then acces?
instruction_id = getattr(record, 'instruction_id', None) or statesampler.get_current_instruction_id()
if instruction_id:
log_entry.instruction_id = instruction_id
|
/gemini review |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code Review
This pull request correctly addresses the missing step_id in worker logs during DoFn.setup() by ensuring the instruction_id is available in the statesampler context. The approach of passing the instruction_id to the BundleProcessor and then using a context manager is sound. I've added one suggestion to simplify the logic in the log handler for better readability.
| if instruction_id: | ||
| with statesampler.instruction_id(instruction_id): | ||
| for op in reversed(self.ops.values()): | ||
| op.setup(self.data_sampler) | ||
| else: | ||
| for op in reversed(self.ops.values()): | ||
| op.setup(self.data_sampler) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
| if hasattr(record, 'instruction_id'): | ||
| log_entry.instruction_id = record.instruction_id | ||
| if not log_entry.instruction_id: | ||
| instruction_id = statesampler.get_current_instruction_id() | ||
| if instruction_id: | ||
| log_entry.instruction_id = instruction_id |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This logic for setting instruction_id can be simplified to be more concise and readable by using getattr and consolidating the checks.
instruction_id = getattr(record, 'instruction_id', None)
if not instruction_id:
instruction_id = statesampler.get_current_instruction_id()
if instruction_id:
log_entry.instruction_id = instruction_id
Fixes #19711
This PR addresses the issue where
step_id(instruction ID) was consistently missing or empty in worker logs generated during theDoFn.setup()lifecycle method.Rationale
The
FnApiLogRecordHandlerrelies onstatesamplerthread-local storage to populate theinstruction_idin log entries. Previously, theBundleProcessorexecuted thesetup()method for operations before the thread-local context was fully initialized for that instruction, causing logs emitted during setup to become orphaned (missing metadata).Changes
sdks/python/apache_beam/runners/worker/sdk_worker.py: Updatedcreate_bundle_processorto pass the activeinstruction_idinto theBundleProcessorconstructor.sdks/python/apache_beam/runners/worker/bundle_processor.py:__init__to acceptinstruction_id.instruction_idinto thestatesamplercontext specifically while iterating through operations to callop.setup().sdks/python/apache_beam/runners/worker/log_handler.py: Updatedemit()to checkrecord.instruction_idbefore falling back to thread-local storage, ensuring explicitly injected IDs are respected.Verification
I verified this fix locally using a reproduction script which forces a log during
setup().setup()hadinstruction_id: None.setup()correctly display theinstruction_id(e.g.,bundle_...).fixes #19711).CHANGES.mdwith noteworthy changes.