Update gRPC Protoc to version 3.24.4 and the generator to 1.59.0

- Add move architecture to cover ppcle64 and s390x - Update code to handle deprecation and removed API
quarkusio · Oct 23, 2023 · 93a9414 · 93a9414
1 parent 0213d81
commit 93a9414
Show file tree

Hide file tree

Showing 6 changed files with 66 additions and 15 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -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>
@@ -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>
@@ -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>
@@ -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>

diff --git a/extensions/grpc/api/src/main/java/io/quarkus/grpc/GrpcClientUtils.java b/extensions/grpc/api/src/main/java/io/quarkus/grpc/GrpcClientUtils.java
@@ -29,11 +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);
+            AbstractStub stub = (AbstractStub) client;
+            return (T) stub.withInterceptors(MetadataUtils.newAttachHeadersInterceptor(extraHeaders));
         } else if (client instanceof MutinyClient) {
             MutinyClient mutinyClient = (MutinyClient) client;
-            AbstractStub stub = MetadataUtils.attachHeaders(mutinyClient.getStub(), extraHeaders);
-            return (T) ((MutinyClient) client).newInstanceWithStub(stub);
+            return (T) mutinyClient.getStub().withInterceptors(MetadataUtils.newAttachHeadersInterceptor(extraHeaders));
         } else {
             throw new IllegalArgumentException("Unsupported client type " + client.getClass());
         }

diff --git a/extensions/grpc/codegen/pom.xml b/extensions/grpc/codegen/pom.xml
@@ -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>
@@ -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>

diff --git a/extensions/grpc/inprocess/pom.xml b/extensions/grpc/inprocess/pom.xml
@@ -17,5 +17,9 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-grpc</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-inprocess</artifactId>
+        </dependency>
     </dependencies>
 </project>
diff --git a/extensions/grpc/runtime/src/main/java/io/grpc/override/ContextStorageOverride.java b/extensions/grpc/runtime/src/main/java/io/grpc/override/ContextStorageOverride.java
@@ -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);
             }
@@ -59,9 +59,4 @@ public Context current() {
             return current;
         }
     }
-
-    @Override
-    public void attach(Context toAttach) {
-        // do nothing, should not be called.
-    }
 }
diff --git a/pom.xml b/pom.xml
@@ -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>