Protobuf 22.5 cpp #11961

kannanjgithub · 2025-03-13T16:17:31Z

No description provided.

…the :grpc-compiler:checkArtifacts step

…ose since it doesn't work on multiarch build arch64.

…ule instead of as a package, and this version is not available to install. Hence building cmake from source. Building the latest source of cmake needs openssl location to be specified (or have openssl turned off) so using the older version 3.13.4

…e VS 2022 installation path.

…n't show it even when it is available

…uf progress bar is causing 'access denied error' on windows console: crc-org/crc#1184

…d cmake from source on 64 bit archs.

…26. Needs fixing

…ue passed to the command.

…ng the CoreFoundation change for linux.

…ell.

…g x64 build.

…y needed to be specified when building the exe.

kannanjgithub · 2025-05-14T10:08:10Z

Windows run: fusion/0b0cb5e6-81e6-47ec-982b-ea4ba8d44f23

buildscripts/grpc-java-artifacts/Dockerfile.multiarch.base

buildscripts/kokoro/windows64.bat

ejona86 · 2025-05-14T14:48:39Z

buildscripts/make_dependencies.bat

-set CMAKE_NAME=cmake-3.3.2-win32-x86
+echo on
+@rem set PROTOBUF_VER=21.7
+choco install -y gradle git curl pkgconfiglite


We don't use the system-installed gradle, so I don't know why that is here. Git should already be installed; is this some different version of git? What uses curl?

I had thought we were going to be adding these installations to the base image itself. OpenJDK in particular I'm not wild about installed every invocation, as it is relatively large.

Removed git and gradle. git command is not available in PATH on the VM I worked with even though the build is going through on CI.

buildscripts/make_dependencies.bat

buildscripts/make_dependencies.sh

compiler/build.gradle

…pportedClassVersionError after removing it: sponge2/529018d0-cbc5-4ebb-8a7f-959f90d3742d

…e build failure. Reintroducing mvn installation only in Dockerfile and not in multiarch and ubuntu.

ejona86

I still wish we installed JDK in our windows base image, but let's get this in and have anything else be future iteration.

ejona86 · 2025-05-21T17:56:10Z

buildscripts/make_dependencies.bat

-set CMAKE_NAME=cmake-3.3.2-win32-x86
+choco install -y pkgconfiglite
+choco install -y openjdk --version=17.0
+set JAVA_HOME="c:\Program Files\OpenJDK\jdk-17"


Delete JAVA_HOME. We don't want it. It just causes confusion. All tools should be able to find java from PATH.

kannanjgithub · 2025-05-22T18:39:02Z

The PR is for merging into master but the checks is running with 1.72.x presubmit config where I haven't changed it from windows 2016 to windows 2019. @ejona86

ejona86 · 2025-05-22T20:11:47Z

@kannanjgithub, it ran for both v1.72.x and master (if two kokoro jobs have the same github status name, then they overwrite each other's status). https://source.cloud.google.com/results/invocations/b798aba2-5a28-4f88-ba57-b25aa54d6e56

I'm looking into why v1.72.x is running.

ejona86 · 2025-05-22T20:24:09Z

I don't know why v1.72.x ran. But I did re-trigger master, because your change to the machine being used hadn't propagated yet. Looks like the new run is using an upgraded machine. https://source.cloud.google.com/results/invocations/0f81ab03-5254-4051-b12f-2b3fd9b7444d

| Package | Type | Package file | Manager | Update | Change | |---|---|---|---|---|---| | [io.grpc:grpc-stub](https://github.com/grpc/grpc-java) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `1.73.0` -> `1.74.0` | | [io.grpc:grpc-protobuf](https://github.com/grpc/grpc-java) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `1.73.0` -> `1.74.0` | | [io.grpc:grpc-netty](https://github.com/grpc/grpc-java) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `1.73.0` -> `1.74.0` | | [io.grpc:protoc-gen-grpc-java](https://github.com/grpc/grpc-java) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `1.73.0` -> `1.74.0` | | [io.grpc:grpc-bom](https://github.com/grpc/grpc-java) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `1.73.0` -> `1.74.0` | | [io.grpc:grpc-api](https://github.com/grpc/grpc-java) | dependencies | misk/gradle/libs.versions.toml | gradle | minor | `1.73.0` -> `1.74.0` | | [com.google.cloud:google-cloud-logging](https://github.com/googleapis/java-logging) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `3.23.0` -> `3.23.1` | | [software.amazon.awssdk:aws-core](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.32.9` -> `2.32.10` | | [software.amazon.awssdk:bom](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.32.9` -> `2.32.10` | | [software.amazon.awssdk:auth](https://aws.amazon.com/sdkforjava) | dependencies | misk/gradle/libs.versions.toml | gradle | patch | `2.32.9` -> `2.32.10` | --- ### Release Notes <details> <summary>grpc/grpc-java (io.grpc:grpc-stub)</summary> ### [`v1.74.0`](https://github.com/grpc/grpc-java/releases/tag/v1.74.0) ##### Behavior Changes - compiler: Default to `@generated=omit` ([`f8700a1`](grpc/grpc-java@f8700a13a)). This omits `javax.annotation.Generated` from the generated code and makes the `org.apache.tomcat:annotations-api` compile-only dependency unnecessary (README and examples changes forthcoming; we delayed those changes until the release landed). You can use the option `@generated=javax` for the previous behavior, but please also file an issue so we can develop alternatives - compiler: generate blocking v2 unary calls that throw StatusException ([#12126](grpc/grpc-java#12126)) ([`a16d655`](grpc/grpc-java@a16d65591)). Previously, the new blocking stub API was identical to the older blocking stub for unary RPCs and used the unchecked `StatusRuntimeException`. However, feedback demonstrated it was confusing to mix that with the checked `StatusException` in `BlockingClientCall`. Now the new blocking stub uses StatusException throughout. grpc-java continues to support the old generated code, but the version of protoc-gen-grpc-java will dictate which API you see. If you support multiple generated code versions, you can use the older blocking v1 stub for unary RPCs ##### Bug Fixes - netty: Fix a race that caused RPCs to hang on start when a GOAWAY was received while the RPCs’ headers were being written to the OS ([`b04c673`](grpc/grpc-java@b04c673fd), [`15c7573`](grpc/grpc-java@15c757398)). This was a very old race, not a recent regression. All streams should now properly fail instead of hanging, although in some cases they may be transparently retried - util: OutlierDetection should use nanoTime, not currentTimeMillis ([#12110](grpc/grpc-java#12110)) ([`1c43098`](grpc/grpc-java@1c4309899)). Previously, changes in the wall time would impact its accounting - xds: Don't allow hostnames in address field in EDS ([#12123](grpc/grpc-java#12123)) ([`482dc5c`](grpc/grpc-java@482dc5c1c)). Only IP addresses were handled properly, and only IP addresses should be handled per gRFC A27 - xds: In resource handling, call onError() for RDS and EDS NACKs ([#12122](grpc/grpc-java#12122)) ([`efe9ccc`](grpc/grpc-java@efe9ccc22)). Previously the resource was NACKed, but gRPC would continue waiting for the resource until a timeout was reached and claim the control plane didn’t send the resource. Now it will fail quickly with an informative error - xds: Implement equals in RingHashConfig ([`a5eaa66`](grpc/grpc-java@a5eaa66cc)). Previously all configuration refreshes were considered a new config, which had the potential for causing unexpected inefficiency problems. This was noticed by new code for gRFC A74 xDS Config Tears that is not yet enabled, so there are no known problems that this caused - LBs should avoid calling LBs after lb.shutdown() ([`1df2a33`](grpc/grpc-java@1df2a3305)). This fixed pick\_first and ring\_hash behavior that could cause rare and “random” races in parent load balancers like a `NullPointerException` in `ClusterImplLoadBalancer.createSubchannel()`, which had a ring\_hash child. This is most likely to help xDS, as it heavily uses hierarchical LB policies ##### Improvements - util: Deliver addresses in a random order to shuffle connection creation ordering ([`f07eb47`](grpc/grpc-java@f07eb47ca)). Previously, connections were created in-order (but non-blocking), so in a fast network the first address could be more likely to connect first given a "microsecond" headstart. That first connection then receives all the buffered RPCs, which could cause temporary, but repeated, load imbalances of the same backend when all clients receive the same list of addresses in the same order. This has been seen in practice, but it is unclear how often it happens. Shuffling has the potential to improve load distribution of new clients when using round\_robin, weighted\_round\_robin, and least\_request, which connect simultaneously to multiple addresses - core: Use lazy message formatting in checkState ([#12144](grpc/grpc-java#12144)) ([`26bd0ee`](grpc/grpc-java@26bd0eee4)). This avoids the potential of unnecessarily formatting an exception as a string when a subchannel fails to connect - bazel: Migrate java\_grpc\_library to use DefaultInfo ([#12148](grpc/grpc-java#12148)) ([`6f69363`](grpc/grpc-java@6f69363d9)). This adds compatibility for `--incompatible_disable_target_default_provider_fields` - binder: Rationalize [@ThreadSafe-ty](https://github.com/ThreadSafe-ty) inside BinderTransport ([#12130](grpc/grpc-java#12130)) ([`c206428`](grpc/grpc-java@c20642874)) - binder: Cancel checkAuthorization() request if still pending upon termination ([#12167](grpc/grpc-java#12167)) ([`30d40a6`](grpc/grpc-java@30d40a617)) ##### Dependencies - compiler: Upgrade Protobuf C++ to 22.5 ([#11961](grpc/grpc-java#11961)) ([`46485c8`](grpc/grpc-java@46485c8b6)). This is used by the pre-built protoc-gen-grpc-java plugin on Maven Central. This should have no visible benefit, but gets us closer to upgrading to Protobuf 27 which added edition 2023 support - release: Migrate artifacts publishing changed from legacy OSSRH to Central Portal ([#12156](grpc/grpc-java#12156)) ([`f99b2aa`](grpc/grpc-java@f99b2aaef)). We aren’t aware of any visible changes to the results on Maven Central </details> <details> <summary>googleapis/java-logging (com.google.cloud:google-cloud-logging)</summary> ### [`v3.23.1`](https://github.com/googleapis/java-logging/blob/HEAD/CHANGELOG.md#3231-2025-07-28) ##### Bug Fixes - **deps:** Update the Java code generator (gapic-generator-java) to 2.60.2 ([6a268f8](googleapis/java-logging@6a268f8)) ##### Dependencies - Update dependency com.google.cloud:sdk-platform-java-config to v3.50.2 ([#1834](googleapis/java-logging#1834)) ([2e46f6e](googleapis/java-logging@2e46f6e)) </details> --- ### Configuration 📅 **Schedule**: Branch creation - "after 6pm every weekday,before 2am every weekday" in timezone Australia/Melbourne, Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Never, or you tick the rebase/retry checkbox. 👻 **Immortal**: This PR will be recreated if closed unmerged. Get [config help](https://github.com/renovatebot/renovate/discussions) if that's undesired. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). GitOrigin-RevId: 135372e1ea07a30d50a7ad0c0665cc322791152a

ejona86 and others added 30 commits March 12, 2025 13:23

Upgrade Protobuf C++ to 22.5

6d68cb5

Re-add downloading of absl

284234c

Set LIBRARY_PATH to /tmp/protobuf/lib

b76908f

Remove LD_LIBRARY_PATH to try fix "found unexpected dependencies" in …

76a613a

…the :grpc-compiler:checkArtifacts step

Add librt.so.1 to needed dependencies.

707a50a

Add libm.so.6 as an expected dependency for linux.

9485113

Replace parallel compilation option -j with env variable for the purp…

5a3e3cc

…ose since it doesn't work on multiarch build arch64.

Fix mistake in current directory used.

a5ec1ae

Fix missing software deps

54c962a

Windows changes.

097c01a

missed this file in the commit

df959ea

Use openjdk 21

6ea8908

Hardcode the location of vcvars64.bat because vswhere doesn't show th…

17a479b

…e VS 2022 installation path.

use VC 2022 install path directly in windows32.bat since vswhere does…

4177f3e

…n't show it even when it is available

Changing it back to using VS170COMNTOOLS

612ba86

Add powershell command = 'SilentlyContinue' because apparently protob…

c19d0a5

…uf progress bar is causing 'access denied error' on windows console: crc-org/crc#1184

Add powershell command = 'SilentlyContinue' because apparently protob…

731a8ed

…uf progress bar is causing 'access denied error' on windows console: crc-org/crc#1184

Add ABSL_INTERNAL_AT_LEAST_CXX17=0 for the 64 bit archs too

a8da589

Re-do lines deleted by mistake (introduced in commit 8d8e03c) to buil…

767c072

…d cmake from source on 64 bit archs.

Revert last commit, fails to build cmake with OPENSSL errors, with 3.…

17a811c

…26. Needs fixing

Use openjdk 11.

e6f445b

Remove Ctrl M characters, use gcc option to specify c++ 14

3b97cc8

Fix open jdk version to 11.0 as 11.0.27 is not available.

a2fd8dc

Fix jdk version

5b96e1e

Remove accidental commenting out.

8c35eed

Missed libs

f91dbc7

Remove leading whitespace in libraries list

19d0917

Fix libs leading space

4d3f252

Don't put spaces in between libs since it breaks the env variable val…

02788d8

…ue passed to the command.

kannanjgithub added 6 commits May 9, 2025 14:46

Add patch for absl time CMakeLists

5280d65

KERNEL32.dll position has moved in deps dump output, and avoid patchi…

9f3f4de

…ng the CoreFoundation change for linux.

Try adding CoreFoundation framework linker args to grpc-compiler as w…

f2677ce

…ell.

Fix dll extraction logic in checkArtifacts

3ecdf56

Increase timeout since build timed out after doing x86 but while doin…

fcbb3b4

…g x64 build.

Remove patching absl time linker args for CoreFoundation since it onl…

dc5e644

…y needed to be specified when building the exe.

kannanjgithub marked this pull request as ready for review May 14, 2025 10:08

kannanjgithub requested a review from ejona86 May 14, 2025 10:10

ejona86 reviewed May 14, 2025

View reviewed changes

kannanjgithub added 7 commits May 15, 2025 11:43

Remove dependencies not needed, and change the logic for checkArtifacts

2c5c636

Convert tabs to spaces and unix2dos

2cec6d2

Unix2dos

b604fd0

Minor changes

092efe4

dos2unix

9072cae

Re-introduce installing apache maven because of facing java.lang.Unsu…

2d025dd

…pportedClassVersionError after removing it: sponge2/529018d0-cbc5-4ebb-8a7f-959f90d3742d

Unsupported class version error was unrelated and not the cause of th…

76276a4

…e build failure. Reintroducing mvn installation only in Dockerfile and not in multiarch and ubuntu.

kannanjgithub requested a review from ejona86 May 15, 2025 14:58

ejona86 approved these changes May 21, 2025

View reviewed changes

Remove setting JAVA_HOME.

c0b53db

ejona86 mentioned this pull request May 22, 2025

Rename PSM interop fallback test suite to light #12091

Merged

kannanjgithub merged commit 46485c8 into grpc:master May 23, 2025
23 of 26 checks passed

kannanjgithub deleted the protobuf-22.5-cpp branch May 23, 2025 06:54

AgraVator pushed a commit to AgraVator/grpc-java that referenced this pull request May 27, 2025

Upgrade Protobuf C++ to 22.5 (grpc#11961)

f984136

ejona86 mentioned this pull request May 27, 2025

protoc-gen-grpc-java: support edition 2023 #11526

Open

AgraVator pushed a commit to AgraVator/grpc-java that referenced this pull request Jun 23, 2025

Upgrade Protobuf C++ to 22.5 (grpc#11961)

851a473

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Protobuf 22.5 cpp #11961

Protobuf 22.5 cpp #11961

Uh oh!

kannanjgithub commented Mar 13, 2025

Uh oh!

kannanjgithub commented May 14, 2025

Uh oh!

Uh oh!

Uh oh!

ejona86 May 14, 2025

Uh oh!

kannanjgithub May 15, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ejona86 left a comment

Uh oh!

ejona86 May 21, 2025

Uh oh!

kannanjgithub commented May 22, 2025

Uh oh!

ejona86 commented May 22, 2025

Uh oh!

ejona86 commented May 22, 2025

Uh oh!

Uh oh!

Uh oh!

Protobuf 22.5 cpp #11961

Protobuf 22.5 cpp #11961

Uh oh!

Conversation

kannanjgithub commented Mar 13, 2025

Uh oh!

kannanjgithub commented May 14, 2025

Uh oh!

Uh oh!

Uh oh!

ejona86 May 14, 2025

Choose a reason for hiding this comment

Uh oh!

kannanjgithub May 15, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ejona86 left a comment

Choose a reason for hiding this comment

Uh oh!

ejona86 May 21, 2025

Choose a reason for hiding this comment

Uh oh!

kannanjgithub commented May 22, 2025

Uh oh!

ejona86 commented May 22, 2025

Uh oh!

ejona86 commented May 22, 2025

Uh oh!

Uh oh!

Uh oh!