Skip to content

Replace ClassLoadingStrategy with custom loading strategy#38906

Merged
Abacn merged 6 commits into
apache:masterfrom
cushon:patch-1
Jun 11, 2026
Merged

Replace ClassLoadingStrategy with custom loading strategy#38906
Abacn merged 6 commits into
apache:masterfrom
cushon:patch-1

Conversation

@cushon

@cushon cushon commented Jun 10, 2026

Copy link
Copy Markdown
Contributor

This change migrates ProtoByteBuddyUtils off ClassLoadingStrategy.Default.INJECTION, to prepare for the deprecation of sun.misc.Unsafe in upcoming JDK versions. See #38905.


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.

@gemini-code-assist

Copy link
Copy Markdown
Contributor

Summary of Changes

Hello, 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 updates the class loading mechanism within ProtoByteBuddyUtils to prepare for future JDK updates. By replacing the hardcoded injection strategy with a custom implementation, the codebase ensures better compatibility and adherence to evolving Java security and internal API standards.

Highlights

  • Migration of ClassLoadingStrategy: Replaced usage of ClassLoadingStrategy.Default.INJECTION with a custom getClassLoadingStrategy method in ProtoByteBuddyUtils to improve compatibility with future JDK versions.
  • JDK Compatibility: This change proactively addresses the upcoming deprecation of sun.misc.Unsafe by moving away from default injection strategies.
New Features

🧠 You can now enable Memory (public preview) 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 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 the 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 counterproductive. 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.

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.

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

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.

Code Review

This pull request updates ProtoByteBuddyUtils.java to use a dynamic class loading strategy via getClassLoadingStrategy instead of the default ClassLoadingStrategy.Default.INJECTION. The reviewer suggests loading the generated classes directly into the target class's class loader (e.g., protoClass.getClassLoader(), protoBuilderClass.getClassLoader(), and builderClass.getClassLoader()) instead of using the context class loader ReflectHelpers.findClassLoader(). This avoids potential class loading issues in environments with complex class loader hierarchies.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

@github-actions

Copy link
Copy Markdown
Contributor

Checks are failing. Will not request review until checks are succeeding. If you'd like to override that behavior, comment assign set of reviewers

@cushon

cushon commented Jun 11, 2026

Copy link
Copy Markdown
Contributor Author

The macos CI failure looks like a flake

Error: Exception in thread "main" java.io.IOException: Downloading from https://services.gradle.org/distributions/gradle-8.14.3-bin.zip failed: timeout (10000ms)

@cushon

cushon commented Jun 11, 2026

Copy link
Copy Markdown
Contributor Author

assign set of reviewers

@cushon

cushon commented Jun 11, 2026

Copy link
Copy Markdown
Contributor Author

/gemini review

@github-actions

Copy link
Copy Markdown
Contributor

Assigning reviewers:

R: @Abacn for label java.

Note: If you would like to opt out of this review, comment assign to next reviewer.

Available commands:

  • stop reviewer notifications - opt out of the automated review tooling
  • remind me after tests pass - tag the comment author after tests pass
  • waiting on author - shift the attention set back to the author (any comment or push by the author will return the attention set to the reviewers)

The PR bot will only process comments in the main thread (not review comments).

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

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.

Code Review

This pull request updates ProtoByteBuddyUtils.java to dynamically resolve the class loader and class loading strategy based on the target protobuf classes (protoClass, protoBuilderClass, and builderClass) instead of using a default injection strategy. Feedback on these changes highlights potential runtime issues, specifically NoClassDefFoundError if the target class loader cannot resolve Beam classes, and a fallback to sun.misc.Unsafe via INJECTION. It is recommended to load the generated helper classes using Beam's own class loader and package space to avoid these issues.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

@cushon

cushon commented Jun 11, 2026

Copy link
Copy Markdown
Contributor Author

/gemini review

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

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.

Code Review

This pull request refactors dynamic class generation in ProtoByteBuddyUtils by explicitly defining parameterized types and updating the class loading strategy. The review feedback highlights a critical classloader visibility issue where using ProtoByteBuddyUtils.class.getClassLoader() can lead to NoClassDefFoundError in multi-classloader environments like Spark or Flink. Additionally, the feedback suggests avoiding raw type casts by casting directly to the parameterized DynamicType.Builder types.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

@cushon

cushon commented Jun 11, 2026

Copy link
Copy Markdown
Contributor Author

/gemini review

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

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.

Code Review

This pull request updates ProtoByteBuddyUtils.java to dynamically determine the class loading target and strategy when generating classes with ByteBuddy, rather than using hardcoded defaults. A critical issue was identified in the newly added getLoadingTarget helper method: because ProtoByteBuddyUtils.class is passed first to ReflectHelpers.findClassLoader, its class loader is always returned, which can lead to runtime class loading errors (such as NoClassDefFoundError) when protoClass is loaded by a different class loader. A simplified comparison of the class loaders is suggested to resolve this issue.

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

@Abacn Abacn left a comment

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.

Thanks!

@codecov

codecov Bot commented Jun 11, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 56.67%. Comparing base (a3cb642) to head (154c9ad).
⚠️ Report is 19 commits behind head on master.

Additional details and impacted files
@@             Coverage Diff              @@
##             master   #38906      +/-   ##
============================================
- Coverage     57.77%   56.67%   -1.11%     
+ Complexity    12968     3638    -9330     
============================================
  Files          2510     1183    -1327     
  Lines        260612   187914   -72698     
  Branches      10668     3753    -6915     
============================================
- Hits         150579   106507   -44072     
+ Misses       104333    77939   -26394     
+ Partials       5700     3468    -2232     
Flag Coverage Δ
java 72.66% <ø> (+8.47%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@Abacn
Abacn merged commit 135a559 into apache:master Jun 11, 2026
33 of 34 checks passed
ash6898 pushed a commit to ash6898/beam that referenced this pull request Jun 29, 2026
* Replace ClassLoadingStrategy with custom loading strategy

* Update findClassLoader calls to match

* spotless

* Generate subclasses in beam's package and loade them in the same classloader as ProtoByteBuddyUtils

* Resolve classloader visibility issues in ProtoByteBuddyUtils
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.

2 participants