[pinpoint-apm#10497] Bump grpc from 1.49.2 to 1.59.0

emeroad · Nov 10, 2023 · f765d2d · f765d2d
1 parent 9b9dffc
commit f765d2d
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/AgentClientMock.java b/collector/src/test/java/com/navercorp/pinpoint/collector/receiver/grpc/AgentClientMock.java
@@ -38,8 +38,8 @@
 import io.grpc.netty.NettyChannelBuilder;
 import io.grpc.stub.MetadataUtils;
 import io.grpc.stub.StreamObserver;
-import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.List;
 import java.util.Objects;
@@ -182,9 +182,10 @@ public CustomLoadBalancer(Helper helper) {
         }
 
         @Override
-        public void handleResolvedAddressGroups(List<EquivalentAddressGroup> servers, Attributes attributes) {
+        public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) {
             if (subchannel == null) {
                 CreateSubchannelArgs.Builder builder = CreateSubchannelArgs.newBuilder();
+                List<EquivalentAddressGroup> servers = resolvedAddresses.getAddresses();
                 builder.setAddresses(servers);
                 builder.setAttributes(Attributes.EMPTY);
                 CreateSubchannelArgs subchannelArgs = builder.build();
@@ -196,6 +197,7 @@ public void handleResolvedAddressGroups(List<EquivalentAddressGroup> servers, At
                 helper.updateBalancingState(CONNECTING, new Picker(PickResult.withSubchannel(subchannel)));
                 subchannel.requestConnection();
             } else {
+                List<EquivalentAddressGroup> servers = resolvedAddresses.getAddresses();
                 subchannel.updateAddresses(servers);
             }
         }

diff --git a/pom.xml b/pom.xml
@@ -219,10 +219,11 @@
         <caffeine.version>2.9.2</caffeine.version>
 
         <netty3.version>3.10.6.Final</netty3.version>
-        <netty4.version>4.1.77.Final</netty4.version>
+        <netty4.version>4.1.97.Final</netty4.version>
 
-        <grpc.version>1.49.2</grpc.version>
-        <protoc.version>3.21.7</protoc.version>
+        <grpc.version>1.59.0</grpc.version>
+        <protobuf-java.version>3.24.0</protobuf-java.version>
+        <protoc.version>3.24.0</protoc.version>
 
         <guava.version>32.1.2-jre</guava.version>
         <guice.version>7.0.0</guice.version>
@@ -1560,7 +1561,7 @@
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java</artifactId>
-                <version>3.21.7</version>
+                <version>${protobuf-java.version}</version>
             </dependency>
 
             <dependency>

diff --git a/realtime/realtime-collector/pom.xml b/realtime/realtime-collector/pom.xml
@@ -29,6 +29,11 @@
             <groupId>com.navercorp.pinpoint</groupId>
             <artifactId>pinpoint-commons-server-cluster</artifactId>
         </dependency>
+        <dependency>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-inprocess</artifactId>
+            <version>${grpc.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>org.awaitility</groupId>