Skip to content

Commit 58637e7

Browse files
committed
Upgrade to gRPC v4
1 parent f206fa8 commit 58637e7

File tree

3 files changed

+27
-7
lines changed

3 files changed

+27
-7
lines changed

extensions/grpc/cli/pom.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,28 @@
2525
<dependency>
2626
<groupId>io.vertx</groupId>
2727
<artifactId>vertx-grpc-client</artifactId>
28+
<exclusions>
29+
<exclusion>
30+
<groupId>org.codehaus.mojo</groupId>
31+
<artifactId>animal-sniffer-annotations</artifactId>
32+
</exclusion>
33+
<exclusion>
34+
<groupId>com.google.code.findbugs</groupId>
35+
<artifactId>jsr305</artifactId>
36+
</exclusion>
37+
<exclusion>
38+
<groupId>org.checkerframework</groupId>
39+
<artifactId>checker-qual</artifactId>
40+
</exclusion>
41+
<exclusion>
42+
<groupId>javax.annotation</groupId>
43+
<artifactId>javax.annotation-api</artifactId>
44+
</exclusion>
45+
<exclusion>
46+
<groupId>com.google.android</groupId>
47+
<artifactId>annotations</artifactId>
48+
</exclusion>
49+
</exclusions>
2850
</dependency>
2951
<dependency>
3052
<groupId>com.google.protobuf</groupId>

extensions/opentelemetry/runtime/src/main/java/io/quarkus/opentelemetry/runtime/tracing/intrumentation/grpc/GrpcTracingServerInterceptor.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
import java.net.SocketAddress;
77
import java.util.Collections;
88

9-
import javax.annotation.Nullable;
10-
119
import jakarta.inject.Singleton;
1210

1311
import io.grpc.ForwardingServerCall.SimpleForwardingServerCall;
@@ -88,14 +86,14 @@ public Integer getServerPort(GrpcRequest grpcRequest) {
8886

8987
@Override
9088
public InetSocketAddress getNetworkLocalInetSocketAddress(
91-
GrpcRequest grpcRequest, @Nullable Status status) {
89+
GrpcRequest grpcRequest, Status status) {
9290
// TODO: later version introduces TRANSPORT_ATTR_LOCAL_ADDR, might be a good idea to use it
9391
return null;
9492
}
9593

9694
@Override
9795
public InetSocketAddress getNetworkPeerInetSocketAddress(
98-
GrpcRequest request, @Nullable Status status) {
96+
GrpcRequest request, Status status) {
9997
SocketAddress address = request.getPeerSocketAddress();
10098
if (address instanceof InetSocketAddress) {
10199
return (InetSocketAddress) address;

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@
8080
<hibernate-search.version>7.2.3.Final</hibernate-search.version>
8181

8282
<!-- Make sure to check compatibility between these 2 gRPC components before upgrade -->
83-
<grpc.version>1.69.1</grpc.version> <!-- when updating, verify if com.google.auth should not be updated too -->
83+
<grpc.version>1.71.0</grpc.version> <!-- when updating, verify if com.google.auth should not be updated too -->
8484
<grpc-jprotoc.version>1.2.2</grpc-jprotoc.version>
85-
<protoc.version>3.25.5</protoc.version>
85+
<protoc.version>4.30.2</protoc.version>
8686
<protobuf-java.version>${protoc.version}</protobuf-java.version>
87-
<protobuf-kotlin.version>4.29.3</protobuf-kotlin.version>
87+
<protobuf-kotlin.version>${protobuf-java.version}</protobuf-kotlin.version>
8888
<proto-google-common-protos.version>2.54.1</proto-google-common-protos.version>
8989

9090
<!-- Used in the build parent and test BOM (for the junit 5 plugin) and in the BOM (for the API) -->

0 commit comments

Comments
 (0)