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 index 94582a851a52d..803549331c583 100644 --- 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 servers, Attributes attributes) { + public void handleResolvedAddresses(ResolvedAddresses resolvedAddresses) { if (subchannel == null) { CreateSubchannelArgs.Builder builder = CreateSubchannelArgs.newBuilder(); + List servers = resolvedAddresses.getAddresses(); builder.setAddresses(servers); builder.setAttributes(Attributes.EMPTY); CreateSubchannelArgs subchannelArgs = builder.build(); @@ -196,6 +197,7 @@ public void handleResolvedAddressGroups(List servers, At helper.updateBalancingState(CONNECTING, new Picker(PickResult.withSubchannel(subchannel))); subchannel.requestConnection(); } else { + List servers = resolvedAddresses.getAddresses(); subchannel.updateAddresses(servers); } } diff --git a/pom.xml b/pom.xml index 86ff973c42d30..3f2b98144ccbf 100644 --- a/pom.xml +++ b/pom.xml @@ -219,10 +219,11 @@ 2.9.2 3.10.6.Final - 4.1.77.Final + 4.1.97.Final - 1.49.2 - 3.21.7 + 1.59.0 + 3.24.0 + 3.24.0 32.1.2-jre 7.0.0 @@ -1560,7 +1561,7 @@ com.google.protobuf protobuf-java - 3.21.7 + ${protobuf-java.version} diff --git a/realtime/realtime-collector/pom.xml b/realtime/realtime-collector/pom.xml index 87df8032e3000..c21e3e55d6e56 100644 --- a/realtime/realtime-collector/pom.xml +++ b/realtime/realtime-collector/pom.xml @@ -29,6 +29,11 @@ com.navercorp.pinpoint pinpoint-commons-server-cluster + + io.grpc + grpc-inprocess + ${grpc.version} + org.awaitility