Skip to content

feat: Upgrade protobuf runtime and gen code to 4.33. #4000

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.

Sign up for GitHub

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

Merged
blakeli0 merged 8 commits into from
Dec 5, 2025
Merged

feat: Upgrade protobuf runtime and gen code to 4.33. #4000

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1824a96
deps: upgrade protobuf to 4.33.0
blakeli0 Dec 1, 2025
52fc24b
chore: generate libraries at Mon Dec 1 21:12:58 UTC 2025
cloud-java-bot Dec 1, 2025
46b2cee
chore: add configuration for protobuf-4.x-rc branch (#3997)
diegomarquezp Dec 2, 2025
0fe2fa2
chore: skip clirr checks
blakeli0 Dec 2, 2025
f2562e5
chore: skip clirr check in showcase
blakeli0 Dec 4, 2025
0731847
chore: Remove hardcoded clirr.skip=false in showcase-clirr check (#4001)
blakeli0 Dec 4, 2025
3a8ef8e
Merge branch 'main' into protobuf-4.x-test-upgrade
blakeli0 Dec 4, 2025
d68bcd2
Merge branch 'protobuf-4.x-rc' into protobuf-4.x-test-upgrade
blakeli0 Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .cloudbuild/library_generation/library_generation.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
FROM docker.io/library/python:3.13.2-slim@sha256:6b3223eb4d93718828223966ad316909c39813dee3ee9395204940500792b740 as final

ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
ARG PROTOC_VERSION=25.8
ARG PROTOC_VERSION=33.0
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The PROTOC_VERSION is being updated to 33.0. This seems inconsistent with the protobuf version 4.33.0 being set in gapic-generator-java-pom-parent/pom.xml. Please verify if this is the correct version for the protoc compiler corresponding to the 4.33.0 Java runtime.

ARG GRPC_VERSION=1.76.1
ENV HOME=/home
ENV OS_ARCHITECTURE="linux-x86_64"
Expand Down
2 changes: 1 addition & 1 deletion .cloudbuild/library_generation/library_generation_airlock.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_
FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc139a0a640942491ec481ad8dda10f2c5b753f5c969393b12480155fe15a63 as final

ARG OWLBOT_CLI_COMMITTISH=3a68a9c0de318784b3aefadcc502a6521b3f1bc5
ARG PROTOC_VERSION=25.8
ARG PROTOC_VERSION=33.0
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

Similar to the other Dockerfile, the PROTOC_VERSION is set to 33.0, which appears inconsistent with the protobuf Java version 4.33.0 used in the project. Please double-check that this is the intended version for the protoc compiler.

ARG GRPC_VERSION=1.76.1
ENV HOME=/home
ENV OS_ARCHITECTURE="linux-x86_64"
Expand Down
4 changes: 3 additions & 1 deletion gapic-generator-java-pom-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,16 @@
<google.http-client.version>2.0.2</google.http-client.version>
<gson.version>2.12.1</gson.version>
<guava.version>33.5.0-jre</guava.version>
<protobuf.version>3.25.8</protobuf.version>
<protobuf.version>4.33.0</protobuf.version>
<opentelemetry.version>1.52.0</opentelemetry.version>
<errorprone.version>2.42.0</errorprone.version>
<j2objc-annotations.version>3.1</j2objc-annotations.version>
<threetenbp.version>1.7.0</threetenbp.version>
<junit.version>5.11.4</junit.version>
<mockito.version>4.11.0</mockito.version>
<slf4j.version>2.0.16</slf4j.version>
<!-- skipping clirr check for protobuf 4.x upgrade -->
<clirr.skip>true</clirr.skip>
Comment on lines +43 to +44
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot Dec 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

While skipping the clirr check is necessary for a major version upgrade with known breaking changes, it's a good practice to create a follow-up issue to re-enable this check and address any binary incompatibilities introduced by the protobuf upgrade. This ensures that binary compatibility is tracked and managed going forward.

</properties>

<developers>
Expand Down
98 changes: 30 additions & 68 deletions java-common-protos/proto-google-common-protos/src/main/java/com/google/api/Advice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@
* limitations under the License.
*/
// Generated by the protocol buffer compiler. DO NOT EDIT!
// NO CHECKED-IN PROTOBUF GENCODE
// source: google/api/config_change.proto
// Protobuf Java Version: 4.33.0

// Protobuf Java Version: 3.25.8
package com.google.api;

/**
Expand All @@ -29,33 +30,38 @@
*
* Protobuf type {@code google.api.Advice}
*/
public final class Advice extends com.google.protobuf.GeneratedMessageV3
@com.google.protobuf.Generated
public final class Advice extends com.google.protobuf.GeneratedMessage
implements
// @@protoc_insertion_point(message_implements:google.api.Advice)
AdviceOrBuilder {
private static final long serialVersionUID = 0L;

static {
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 33,
/* patch= */ 0,
/* suffix= */ "",
"Advice");
}

// Use Advice.newBuilder() to construct.
private Advice(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
private Advice(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
super(builder);
}

private Advice() {
description_ = "";
}

@java.lang.Override
@SuppressWarnings({"unused"})
protected java.lang.Object newInstance(UnusedPrivateParameter unused) {
return new Advice();
}

public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
return com.google.api.ConfigChangeProto.internal_static_google_api_Advice_descriptor;
}

@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.api.ConfigChangeProto.internal_static_google_api_Advice_fieldAccessorTable
.ensureFieldAccessorsInitialized(
Expand Down Expand Up @@ -131,8 +137,8 @@ public final boolean isInitialized() {

@java.lang.Override
public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException {
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
com.google.protobuf.GeneratedMessageV3.writeString(output, 2, description_);
if (!com.google.protobuf.GeneratedMessage.isStringEmpty(description_)) {
com.google.protobuf.GeneratedMessage.writeString(output, 2, description_);
}
getUnknownFields().writeTo(output);
}
Expand All @@ -143,8 +149,8 @@ public int getSerializedSize() {
if (size != -1) return size;

size = 0;
if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(description_)) {
size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, description_);
if (!com.google.protobuf.GeneratedMessage.isStringEmpty(description_)) {
size += com.google.protobuf.GeneratedMessage.computeStringSize(2, description_);
}
size += getUnknownFields().getSerializedSize();
memoizedSize = size;
Expand Down Expand Up @@ -216,38 +222,38 @@ public static com.google.api.Advice parseFrom(

public static com.google.api.Advice parseFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
}

public static com.google.api.Advice parseFrom(
java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
return com.google.protobuf.GeneratedMessage.parseWithIOException(
PARSER, input, extensionRegistry);
}

public static com.google.api.Advice parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input);
return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input);
}

public static com.google.api.Advice parseDelimitedFrom(
java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(
return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(
PARSER, input, extensionRegistry);
}

public static com.google.api.Advice parseFrom(com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input);
return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input);
}

public static com.google.api.Advice parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return com.google.protobuf.GeneratedMessageV3.parseWithIOException(
return com.google.protobuf.GeneratedMessage.parseWithIOException(
PARSER, input, extensionRegistry);
}

Expand All @@ -270,7 +276,7 @@ public Builder toBuilder() {
}

@java.lang.Override
protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
Builder builder = new Builder(parent);
return builder;
}
Expand All @@ -285,7 +291,7 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
*
* Protobuf type {@code google.api.Advice}
*/
public static final class Builder extends com.google.protobuf.GeneratedMessageV3.Builder<Builder>
public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder>
implements
// @@protoc_insertion_point(builder_implements:google.api.Advice)
com.google.api.AdviceOrBuilder {
Expand All @@ -294,7 +300,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
}

@java.lang.Override
protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
return com.google.api.ConfigChangeProto.internal_static_google_api_Advice_fieldAccessorTable
.ensureFieldAccessorsInitialized(
Expand All @@ -304,7 +310,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
// Construct using com.google.api.Advice.newBuilder()
private Builder() {}

private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) {
super(parent);
}

Expand Down Expand Up @@ -352,39 +358,6 @@ private void buildPartial0(com.google.api.Advice result) {
}
}

@java.lang.Override
public Builder clone() {
return super.clone();
}

@java.lang.Override
public Builder setField(
com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
return super.setField(field, value);
}

@java.lang.Override
public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) {
return super.clearField(field);
}

@java.lang.Override
public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) {
return super.clearOneof(oneof);
}

@java.lang.Override
public Builder setRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) {
return super.setRepeatedField(field, index, value);
}

@java.lang.Override
public Builder addRepeatedField(
com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) {
return super.addRepeatedField(field, value);
}

@java.lang.Override
public Builder mergeFrom(com.google.protobuf.Message other) {
if (other instanceof com.google.api.Advice) {
Expand Down Expand Up @@ -569,17 +542,6 @@ public Builder setDescriptionBytes(com.google.protobuf.ByteString value) {
return this;
}

@java.lang.Override
public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
}

@java.lang.Override
public final Builder mergeUnknownFields(
final com.google.protobuf.UnknownFieldSet unknownFields) {
return super.mergeUnknownFields(unknownFields);
}

// @@protoc_insertion_point(builder_scope:google.api.Advice)
}

Expand Down
4 changes: 3 additions & 1 deletion ...ommon-protos/proto-google-common-protos/src/main/java/com/google/api/AdviceOrBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
* limitations under the License.
*/
// Generated by the protocol buffer compiler. DO NOT EDIT!
// NO CHECKED-IN PROTOBUF GENCODE
// source: google/api/config_change.proto
// Protobuf Java Version: 4.33.0

// Protobuf Java Version: 3.25.8
package com.google.api;

@com.google.protobuf.Generated
public interface AdviceOrBuilder
extends
// @@protoc_insertion_point(interface_extends:google.api.Advice)
Expand Down
19 changes: 16 additions & 3 deletions ...mmon-protos/proto-google-common-protos/src/main/java/com/google/api/AnnotationsProto.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,26 @@
* limitations under the License.
*/
// Generated by the protocol buffer compiler. DO NOT EDIT!
// NO CHECKED-IN PROTOBUF GENCODE
// source: google/api/annotations.proto
// Protobuf Java Version: 4.33.0

// Protobuf Java Version: 3.25.8
package com.google.api;

public final class AnnotationsProto {
@com.google.protobuf.Generated
public final class AnnotationsProto extends com.google.protobuf.GeneratedFile {
private AnnotationsProto() {}

static {
com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
/* major= */ 4,
/* minor= */ 33,
/* patch= */ 0,
/* suffix= */ "",
"AnnotationsProto");
}

public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {
registry.add(com.google.api.AnnotationsProto.http);
}
Expand Down Expand Up @@ -71,7 +83,8 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
com.google.api.HttpProto.getDescriptor(),
com.google.protobuf.DescriptorProtos.getDescriptor(),
});
http.internalInit(descriptor.getExtensions().get(0));
http.internalInit(descriptor.getExtension(0));
descriptor.resolveAllFeaturesImmutable();
com.google.api.HttpProto.getDescriptor();
com.google.protobuf.DescriptorProtos.getDescriptor();
}
Expand Down
Loading
Loading