Skip to content
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

fix(deps): update dependency com.google.protobuf:protobuf-bom to v4 #6295

Closed
wants to merge 6 commits into from

Conversation

renovate[bot]
Copy link
Contributor

@renovate renovate bot commented Mar 13, 2024

This PR contains the following updates:

Package Change Age Adoption Passing Confidence
com.google.protobuf:protobuf-bom (source) 3.25.4 -> 4.28.2 age adoption passing confidence

Release Notes

protocolbuffers/protobuf (com.google.protobuf:protobuf-bom)

v3.25.5


Configuration

📅 Schedule: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 Automerge: Disabled by config. Please merge this manually once you are satisfied.

Rebasing: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 Ignore: Close this PR and you won't be reminded about this update again.


EDIT from Jack:
Rebase checkbox removed since rebasing will cause custom changes to this PR to be lost.


This PR was generated by Mend Renovate. View the repository job log.

@renovate renovate bot requested a review from a team March 13, 2024 20:07
@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch from 6a82532 to 7133528 Compare March 16, 2024 21:26
@breedx-splk
Copy link
Contributor

I fiddled around with this for a while and couldn't get it working. It looks like the base class of generated messages changes (source?) and it seems like the toByteArray() (at least on grpc Status class) goes away.

@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch 2 times, most recently from a1c3c96 to dc7d481 Compare March 29, 2024 15:51
@jack-berg
Copy link
Member

It looks like the base class of generated messages changes (grpc/grpc-java#11015) and it seems like the toByteArray() (at least on grpc Status class) goes away.

The base class for messages changed from GeneratedMessageV3 to GeneratedMessage. The Status class comes from com.google.api.grpc:proto-google-common-protos, which hasn't upgraded to protobuf-bom v4 yet, and so there is a transitive dependency conflict which leads to the missing toByteArray method. We'll need to wait for com.google.api.grpc:proto-google-common-protos to upgrade, or maybe generate the classes ourselves if we're impatient, before upgrading.

Luckily, com.google.protobuf:protobuf-bom is only used in tests.

@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch from dc7d481 to 693f6b5 Compare April 13, 2024 18:11
@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch from 693f6b5 to 00eaa17 Compare April 18, 2024 14:32
@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch 3 times, most recently from 5435b21 to 6e81e4a Compare May 2, 2024 18:43
@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch from 6e81e4a to d12b85d Compare May 23, 2024 16:44
@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch 2 times, most recently from 8a1ed1c to c3a62d7 Compare June 6, 2024 19:03
@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch from c3a62d7 to c46c685 Compare June 12, 2024 16:03
@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch 2 times, most recently from 0104d71 to d272216 Compare June 28, 2024 16:22
@jack-berg
Copy link
Member

Looks like more work is still needed: protocolbuffers/protobuf#17247

@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch from d272216 to be149db Compare July 11, 2024 03:38
@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch 3 times, most recently from 271f558 to 54a125d Compare July 31, 2024 18:04
@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch 2 times, most recently from 9c33e2c to 1b32dcb Compare August 19, 2024 19:34
@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch 2 times, most recently from c63273f to 3f01da8 Compare August 28, 2024 22:43
@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch from 3f01da8 to 0c034bd Compare September 11, 2024 22:30
@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch 2 times, most recently from 7f29689 to 223e5ed Compare September 18, 2024 21:37
@renovate renovate bot requested a review from a team as a code owner September 18, 2024 21:37
@renovate renovate bot changed the title Update dependency com.google.protobuf:protobuf-bom to v4 fix(deps): update dependency com.google.protobuf:protobuf-bom to v4 Sep 20, 2024
@renovate renovate bot force-pushed the renovate/com.google.protobuf-protobuf-bom-4.x branch from 223e5ed to 20c3698 Compare September 20, 2024 17:06
Copy link
Contributor Author

renovate bot commented Sep 23, 2024

Edited/Blocked Notification

Renovate will not automatically rebase this PR, because it does not recognize the last commit author and assumes somebody else may have edited the PR.

You can manually request rebase by checking the rebase/retry box above.

⚠️ Warning: custom changes will be lost.

@jack-berg
Copy link
Member

Two blockers stand in the way of merging this:

  1. opentelemetry-proto-java still depends on an older version of grpc java. Need to bump those dependencies and cut a release: Bump grpc and protobuf versions opentelemetry-proto-java#17. Not clear how we cut a release since opentelemetry-proto-java versions are currently coupled to opentelemetry-proto releases.
  2. Armeria has a transitive on grpc-version and has not yet upgraded to the 1.68.0 version which uses protobuf v4. This causes tests to fail which use armeria. Tracking issue: Compatibility with armeria and grpc 4.26.0 versions is broken. line/armeria#5504

Basically, we have to wait for all our dependencies which rely on grpc-java to upgrade to 1.68.0 and cut a release. Not clear if any others remain besides the two I've noted here. What a mess.

@jack-berg
Copy link
Member

Now that opentelemetry-proto-java:1.4.0-alpha is released, we're actually good to move forward with this. Note that I appear to have been incorrect about the requirement that armeria also update to 4.26.0.

This comment explains why.

Anyway, the build currently passes as long as I exclude the /exporter/otlp/profiles module which has a bunch of breaking changes. @jhalliday is working on this so we have a path to updating to protobuf v4.27.x and opentelemetry-proto-java v1.4.0 by next week.

Copy link

codecov bot commented Nov 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 90.31%. Comparing base (c71bd9d) to head (71c7207).
Report is 8 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #6295   +/-   ##
=========================================
  Coverage     90.31%   90.31%           
  Complexity     6594     6594           
=========================================
  Files           729      729           
  Lines         19784    19784           
  Branches       1945     1945           
=========================================
  Hits          17867    17867           
  Misses         1325     1325           
  Partials        592      592           

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

@jkwatson
Copy link
Contributor

whoa. build finally passing! Is this ready to merge?

@jack-berg
Copy link
Member

This change was bundled into #6906. We needed to update the version of opentelemetry-proto and the version of com.google.protobuf:protobuf-bom in lockstep. Closing this PR, finally...

@jack-berg jack-berg closed this Dec 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants