[pinpoint-apm#9932] Remove thrift dependency of Collector module

Author: emeroad

collector/src/main/java/com/navercorp/pinpoint/collector/PinpointCollectorModule.java

@@ -20,7 +20,6 @@
         "classpath:servlet-context-collector.xml",
 
         "classpath:applicationContext-collector-grpc.xml",
-        "classpath:applicationContext-collector-thrift.xml",
         "classpath:applicationContext-collector-hbase.xml",
 })
 @Import({

collector/src/main/java/com/navercorp/pinpoint/collector/cluster/ClusterPointRepository.java

@@ -19,7 +19,6 @@
 import com.navercorp.pinpoint.collector.receiver.grpc.PinpointGrpcServer;
 import com.navercorp.pinpoint.common.server.cluster.ClusterKey;
 import com.navercorp.pinpoint.rpc.common.SocketStateCode;
-import com.navercorp.pinpoint.rpc.server.PinpointServer;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -93,12 +92,7 @@ public Set<ClusterKey> getAvailableAgentKeyList() {
                 final ClusterKey key = entry.getKey();
                 final Set<T> clusterPointSet = entry.getValue();
                 for (T clusterPoint : clusterPointSet) {
-                    if (clusterPoint instanceof ThriftAgentConnection) {
-                        PinpointServer pinpointServer = ((ThriftAgentConnection) clusterPoint).getPinpointServer();
-                        if (SocketStateCode.isRunDuplex(pinpointServer.getCurrentStateCode())) {
-                            availableAgentKeySet.add(key);
-                        }
-                    } else if (clusterPoint instanceof GrpcAgentConnection) {
+                    if (clusterPoint instanceof GrpcAgentConnection) {
                         PinpointGrpcServer pinpointGrpcServer = ((GrpcAgentConnection) clusterPoint).getPinpointGrpcServer();
                         if (SocketStateCode.isRunDuplex(pinpointGrpcServer.getState())) {
                             availableAgentKeySet.add(key);

collector/src/main/java/com/navercorp/pinpoint/collector/cluster/ClusterPointStateChangedEventHandler.java

@@ -19,7 +19,6 @@
 import com.navercorp.pinpoint.collector.cluster.ClusterPoint;
 import com.navercorp.pinpoint.collector.cluster.ClusterPointLocator;
 import com.navercorp.pinpoint.collector.cluster.GrpcAgentConnection;
-import com.navercorp.pinpoint.collector.cluster.ThriftAgentConnection;
 import com.navercorp.pinpoint.collector.cluster.route.filter.RouteFilter;
 import com.navercorp.pinpoint.io.ResponseMessage;
 import com.navercorp.pinpoint.thrift.dto.command.TCommandTransferResponse;
@@ -87,10 +86,7 @@ private TCommandTransferResponse onRoute0(RequestEvent event) {
         }
 
         CompletableFuture<ResponseMessage> future;
-        if (clusterPoint instanceof ThriftAgentConnection) {
-            ThriftAgentConnection thriftAgentConnection = (ThriftAgentConnection) clusterPoint;
-            future = thriftAgentConnection.request(event.getDeliveryCommand().getPayload());
-        } else if (clusterPoint instanceof GrpcAgentConnection) {
+        if (clusterPoint instanceof GrpcAgentConnection) {
             GrpcAgentConnection grpcAgentConnection = (GrpcAgentConnection) clusterPoint;
             future = grpcAgentConnection.request(event.getRequestObject());
         } else {

collector/src/main/java/com/navercorp/pinpoint/collector/cluster/route/DefaultRouteHandler.java

@@ -19,12 +19,10 @@
 import com.navercorp.pinpoint.collector.cluster.ClusterPoint;
 import com.navercorp.pinpoint.collector.cluster.ClusterPointLocator;
 import com.navercorp.pinpoint.collector.cluster.GrpcAgentConnection;
-import com.navercorp.pinpoint.collector.cluster.ThriftAgentConnection;
 import com.navercorp.pinpoint.collector.cluster.route.filter.RouteFilter;
 import com.navercorp.pinpoint.rpc.packet.stream.StreamClosePacket;
 import com.navercorp.pinpoint.rpc.packet.stream.StreamCode;
 import com.navercorp.pinpoint.rpc.packet.stream.StreamResponsePacket;
-import com.navercorp.pinpoint.rpc.server.PinpointServer;
 import com.navercorp.pinpoint.rpc.stream.ClientStreamChannel;
 import com.navercorp.pinpoint.rpc.stream.ClientStreamChannelEventHandler;
 import com.navercorp.pinpoint.rpc.stream.ServerStreamChannel;
@@ -109,16 +107,7 @@ private TCommandTransferResponse onRoute0(StreamEvent event) {
         }
 
         try {
-            if (clusterPoint instanceof ThriftAgentConnection) {
-                StreamRouteManager routeManager = new StreamRouteManager(event);
-
-                ServerStreamChannel consumerStreamChannel = event.getStreamChannel();
-                consumerStreamChannel.setAttributeIfAbsent(ATTACHMENT_KEY, routeManager);
-
-                ClientStreamChannel producerStreamChannel = createStreamChannel((ThriftAgentConnection) clusterPoint, event.getDeliveryCommand().getPayload(), routeManager);
-                routeManager.setProducer(producerStreamChannel);
-                return createResponse(TRouteResult.OK);
-            } else if (clusterPoint instanceof GrpcAgentConnection) {
+            if (clusterPoint instanceof GrpcAgentConnection) {
                 StreamRouteManager routeManager = new StreamRouteManager(event);
 
                 ServerStreamChannel consumerStreamChannel = event.getStreamChannel();
@@ -142,11 +131,6 @@ private TCommandTransferResponse onRoute0(StreamEvent event) {
         return createResponse(TRouteResult.UNKNOWN);
     }
 
-    private ClientStreamChannel createStreamChannel(ThriftAgentConnection clusterPoint, byte[] payload, ClientStreamChannelEventHandler streamChannelEventHandler) throws StreamException {
-        PinpointServer pinpointServer = clusterPoint.getPinpointServer();
-        return pinpointServer.openStreamAndAwait(payload, streamChannelEventHandler, 3000);
-    }
-
     public void close(ServerStreamChannel consumerStreamChannel) {
         Object attachmentListener = consumerStreamChannel.getAttribute(ATTACHMENT_KEY);