Skip to content

Generate the Athenz xDS protos with java_multiple_files - #6915

Open
minwoox wants to merge 1 commit into
line:mainfrom
minwoox:athenz_proto
Open

Generate the Athenz xDS protos with java_multiple_files#6915
minwoox wants to merge 1 commit into
line:mainfrom
minwoox:athenz_proto

Conversation

@minwoox

@minwoox minwoox commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

Motivation:

The Armeria xDS protos follow the java_multiple_files convention (as do the gRPC, example and benchmark modules), but the Athenz protos added in #6853 were missing it, so their messages were generated as nested classes under an outer wrapper.

Modifications:

  • Add option java_multiple_files = true; to armeria/xds/athenz/athenz_filter_config.proto and armeria/xds/athenz/athenz_access_token.proto, so each message is generated as a top-level class.

Result:

  • Athenz xDS message classes are now top-level, matching the convention.

Motivation:

The Armeria xDS protos we author follow the java_multiple_files convention
(as do the gRPC, example and benchmark modules), but the Athenz protos added
in line#6853 were missing it, so their messages were generated as nested classes
under an outer wrapper.

Modifications:

- Add `option java_multiple_files = true;` to
  armeria/xds/athenz/athenz_filter_config.proto and
  armeria/xds/athenz/athenz_access_token.proto, so each message is generated
  as a top-level class.

Result:

- Athenz xDS message classes are now top-level, matching the convention.
@minwoox minwoox added this to the 1.42.0 milestone Aug 11, 2026
@minwoox
minwoox requested review from ikhoon and jrhee17 as code owners August 11, 2026 07:04
@coderabbitai

coderabbitai Bot commented Aug 11, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 458c72bb-59d4-4091-911b-88cde258bc9e

📥 Commits

Reviewing files that changed from the base of the PR and between 9593306 and aa0fa8a.

📒 Files selected for processing (6)
  • xds-api/src/main/proto/armeria/xds/athenz/athenz_access_token.proto
  • xds-api/src/main/proto/armeria/xds/athenz/athenz_filter_config.proto
  • xds-api/src/main/proto/armeria/xds/supported.proto
  • xds-athenz/src/main/java/com/linecorp/armeria/xds/filter/athenz/AccessTokenConstraintFilterFactory.java
  • xds-athenz/src/main/java/com/linecorp/armeria/xds/filter/athenz/AccessTokenTargetFilterFactory.java
  • xds-athenz/src/main/java/com/linecorp/armeria/xds/filter/athenz/MappingTemplate.java

📝 Walkthrough

Walkthrough

The protobuf definitions enable separate Java files for Athenz declarations. A comment documents the intentional nested supported namespace. Athenz Java classes now import the generated top-level protobuf and configuration types.

Changes

Athenz protobuf type generation

Layer / File(s) Summary
Configure protobuf Java declarations
xds-api/src/main/proto/armeria/xds/athenz/*.proto, xds-api/src/main/proto/armeria/xds/supported.proto
Athenz protos enable java_multiple_files. supported.proto documents why the option remains omitted there.
Update Athenz type imports
xds-athenz/src/main/java/com/linecorp/armeria/xds/filter/athenz/*.java
Filter factories and MappingTemplate use the new top-level configuration and protobuf types.

Estimated code review effort: 2 (Simple) | ~10 minutes

Possibly related PRs

Suggested reviewers: ikhoon, jrhee17

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description check ✅ Passed The description clearly explains the addition of java_multiple_files and its effect on generated Athenz xDS message classes.
Title check ✅ Passed The title clearly and concisely states that the Athenz xDS protos will use java_multiple_files.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@mergify

mergify Bot commented Aug 11, 2026

Copy link
Copy Markdown

Tick the box to add this pull request to the merge queue (same as @mergifyio queue).

  • Queue this pull request

@codecov

codecov Bot commented Aug 11, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 75.16%. Comparing base (8150425) to head (aa0fa8a).
⚠️ Report is 583 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #6915      +/-   ##
============================================
+ Coverage     74.46%   75.16%   +0.70%     
- Complexity    22234    25508    +3274     
============================================
  Files          1963     2267     +304     
  Lines         82437    94558   +12121     
  Branches      10764    12377    +1613     
============================================
+ Hits          61385    71078    +9693     
- Misses        15918    17601    +1683     
- Partials       5134     5879     +745     

☔ 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.

@jrhee17 jrhee17 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.

👍 👍

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