Skip to content

Commit

Permalink
Merge pull request #36627 from cescoffier/grpc-update=and-arch
Browse files Browse the repository at this point in the history 
Update gRPC Protoc to version 3.24.4 and the generator to 1.59.0
  • Loading branch information
@gsmet
gsmet authored Oct 24, 2023
2 parents c57a1df + 6ffb578 commit 8de2d22
Show file tree
Hide file tree
Showing 6 changed files with 84 additions and 14 deletions.
36 changes: 32 additions & 4 deletions bom/application/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6043,6 +6043,20 @@
<type>exe</type>
<version>${protoc.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<classifier>linux-ppcle_64</classifier>
<type>exe</type>
<version>${protoc.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<classifier>linux-s390_64</classifier>
<type>exe</type>
<version>${protoc.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
Expand All @@ -6060,14 +6074,14 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<classifier>osx-x86_64</classifier>
<classifier>osx-aarch_64</classifier>
<type>exe</type>
<version>${protoc.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<classifier>osx-aarch_64</classifier>
<classifier>osx-x86_64</classifier>
<type>exe</type>
<version>${protoc.version}</version>
</dependency>
Expand All @@ -6092,6 +6106,20 @@
<classifier>linux-aarch_64</classifier>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>protoc-gen-grpc-java</artifactId>
<type>exe</type>
<classifier>linux-ppcle_64</classifier>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>protoc-gen-grpc-java</artifactId>
<type>exe</type>
<classifier>linux-s390_64</classifier>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>protoc-gen-grpc-java</artifactId>
Expand All @@ -6110,14 +6138,14 @@
<groupId>io.grpc</groupId>
<artifactId>protoc-gen-grpc-java</artifactId>
<type>exe</type>
<classifier>osx-x86_64</classifier>
<classifier>osx-aarch_64</classifier>
<version>${grpc.version}</version>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>protoc-gen-grpc-java</artifactId>
<type>exe</type>
<classifier>osx-aarch_64</classifier>
<classifier>osx-x86_64</classifier>
<version>${grpc.version}</version>
</dependency>
<dependency>
Expand Down
5 changes: 3 additions & 2 deletions extensions/grpc/api/src/main/java/io/quarkus/grpc/GrpcClientUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,11 @@ public static <T> T attachHeaders(T client, Metadata extraHeaders) {
client = getProxiedObject(client);

if (client instanceof AbstractStub) {
return (T) MetadataUtils.attachHeaders((AbstractStub) client, extraHeaders);
return (T) ((AbstractStub) client).withInterceptors(MetadataUtils.newAttachHeadersInterceptor(extraHeaders));
} else if (client instanceof MutinyClient) {
MutinyClient mutinyClient = (MutinyClient) client;
AbstractStub stub = MetadataUtils.attachHeaders(mutinyClient.getStub(), extraHeaders);
AbstractStub stub = mutinyClient.getStub()
.withInterceptors(MetadataUtils.newAttachHeadersInterceptor(extraHeaders));
return (T) ((MutinyClient) client).newInstanceWithStub(stub);
} else {
throw new IllegalArgumentException("Unsupported client type " + client.getClass());
Expand Down
24 changes: 24 additions & 0 deletions extensions/grpc/codegen/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,18 @@
<classifier>linux-aarch_64</classifier>
<type>exe</type>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<classifier>linux-ppcle_64</classifier>
<type>exe</type>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
<classifier>linux-s390_64</classifier>
<type>exe</type>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protoc</artifactId>
Expand Down Expand Up @@ -73,6 +85,18 @@
<type>exe</type>
<classifier>linux-aarch_64</classifier>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>protoc-gen-grpc-java</artifactId>
<type>exe</type>
<classifier>linux-ppcle_64</classifier>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>protoc-gen-grpc-java</artifactId>
<type>exe</type>
<classifier>linux-s390_64</classifier>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>protoc-gen-grpc-java</artifactId>
Expand Down
22 changes: 22 additions & 0 deletions extensions/grpc/inprocess/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,27 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-inprocess</artifactId>
<exclusions>
<exclusion>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</exclusion>
<exclusion>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>org.checkerframework</groupId>
<artifactId>checker-qual</artifactId>
</exclusion>
<exclusion>
<groupId>com.google.android</groupId>
<artifactId>annotations</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
7 changes: 1 addition & 6 deletions extensions/grpc/runtime/src/main/java/io/grpc/override/ContextStorageOverride.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public void detach(Context context, Context toRestore) {
}
} else {
if (dc != null && VertxContext.isDuplicatedContext(dc)) {
// Do nothing duplicated context are not shared.
// Do nothing - duplicated context are not shared.
} else {
fallback.set(null);
}
Expand All @@ -59,9 +59,4 @@ public Context current() {
return current;
}
}

@Override
public void attach(Context toAttach) {
// do nothing, should not be called.
}
}
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
<kubernetes-client.version>6.8.1</kubernetes-client.version> <!-- Please check with Java Operator SDK team before updating -->

<!-- Make sure to check compatibility between these 2 gRPC components before upgrade -->
<grpc.version>1.57.2</grpc.version> <!-- when updating, verify if com.google.auth should not be updated too -->
<grpc.version>1.59.0</grpc.version> <!-- when updating, verify if com.google.auth should not be updated too -->
<grpc-jprotoc.version>1.2.1</grpc-jprotoc.version>
<protoc.version>3.22.0</protoc.version>
<protoc.version>3.24.4</protoc.version>
<protobuf-java.version>${protoc.version}</protobuf-java.version>
<proto-google-common-protos.version>2.27.0</proto-google-common-protos.version>

Expand Down

0 comments on commit 8de2d22

Please sign in to comment.