Skip to content

Commit 357a3d8

Browse files
committed
[pinpoint-apm#9932] Removed thrift dependency of Agent module
1 parent a49d3cc commit 357a3d8

File tree

7 files changed

+7
-9
lines changed

7 files changed

+7
-9
lines changed

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

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
package com.navercorp.pinpoint.collector.cluster;
1818

19-
import com.navercorp.pinpoint.collector.cluster.grpc.GrpcAgentConnection;
2019
import com.navercorp.pinpoint.collector.receiver.grpc.PinpointGrpcServer;
2120
import com.navercorp.pinpoint.common.server.cluster.ClusterKey;
2221
import com.navercorp.pinpoint.rpc.common.SocketStateCode;

collector/src/main/java/com/navercorp/pinpoint/collector/cluster/grpc/GrpcAgentConnection.java renamed to collector/src/main/java/com/navercorp/pinpoint/collector/cluster/GrpcAgentConnection.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,10 @@
1414
* limitations under the License.
1515
*/
1616

17-
package com.navercorp.pinpoint.collector.cluster.grpc;
17+
package com.navercorp.pinpoint.collector.cluster;
1818

1919
import com.google.protobuf.GeneratedMessageV3;
20-
import com.navercorp.pinpoint.collector.cluster.ClusterPoint;
21-
import com.navercorp.pinpoint.collector.cluster.SupportedCommandUtils;
20+
import com.navercorp.pinpoint.collector.cluster.grpc.CommandThriftToGrpcMessageConverter;
2221
import com.navercorp.pinpoint.collector.receiver.grpc.PinpointGrpcServer;
2322
import com.navercorp.pinpoint.common.server.cluster.ClusterKey;
2423
import com.navercorp.pinpoint.rpc.PinpointSocketException;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import com.navercorp.pinpoint.collector.cluster.ClusterPoint;
2020
import com.navercorp.pinpoint.collector.cluster.ClusterPointLocator;
21+
import com.navercorp.pinpoint.collector.cluster.GrpcAgentConnection;
2122
import com.navercorp.pinpoint.collector.cluster.ThriftAgentConnection;
22-
import com.navercorp.pinpoint.collector.cluster.grpc.GrpcAgentConnection;
2323
import com.navercorp.pinpoint.collector.cluster.route.filter.RouteFilter;
2424
import com.navercorp.pinpoint.rpc.ResponseMessage;
2525
import com.navercorp.pinpoint.thrift.dto.command.TCommandTransferResponse;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import com.navercorp.pinpoint.collector.cluster.ClusterPoint;
2020
import com.navercorp.pinpoint.collector.cluster.ClusterPointLocator;
21+
import com.navercorp.pinpoint.collector.cluster.GrpcAgentConnection;
2122
import com.navercorp.pinpoint.collector.cluster.ThriftAgentConnection;
22-
import com.navercorp.pinpoint.collector.cluster.grpc.GrpcAgentConnection;
2323
import com.navercorp.pinpoint.collector.cluster.route.filter.RouteFilter;
2424
import com.navercorp.pinpoint.rpc.packet.stream.StreamClosePacket;
2525
import com.navercorp.pinpoint.rpc.packet.stream.StreamCode;

collector/src/main/java/com/navercorp/pinpoint/collector/controller/ClusterPointController.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.fasterxml.jackson.databind.ObjectMapper;
2121
import com.navercorp.pinpoint.collector.cluster.ClusterPoint;
2222
import com.navercorp.pinpoint.collector.cluster.ClusterPointLocator;
23-
import com.navercorp.pinpoint.collector.cluster.grpc.GrpcAgentConnection;
23+
import com.navercorp.pinpoint.collector.cluster.GrpcAgentConnection;
2424
import com.navercorp.pinpoint.collector.receiver.grpc.PinpointGrpcServer;
2525
import com.navercorp.pinpoint.common.server.cluster.ClusterKey;
2626
import com.navercorp.pinpoint.common.util.Assert;

collector/src/main/java/com/navercorp/pinpoint/collector/receiver/grpc/PinpointGrpcServer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import com.google.protobuf.Empty;
2020
import com.google.protobuf.GeneratedMessageV3;
21+
import com.navercorp.pinpoint.collector.cluster.GrpcAgentConnection;
2122
import com.navercorp.pinpoint.collector.cluster.ProfilerClusterManager;
22-
import com.navercorp.pinpoint.collector.cluster.grpc.GrpcAgentConnection;
2323
import com.navercorp.pinpoint.common.server.cluster.ClusterKey;
2424
import com.navercorp.pinpoint.grpc.MessageFormatUtils;
2525
import com.navercorp.pinpoint.grpc.trace.PCmdActiveThreadCount;

profiler-thrift/src/main/java/com/navercorp/pinpoint/profiler/thrift/sender/message/ThreadDumpThriftMessageConverter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @author jaehong.kim
2828
*/
2929
public class ThreadDumpThriftMessageConverter implements MessageConverter<Object, TThreadDump> {
30-
private final ThreadStateThriftMessageConverter threadStateMessageConverter = new ThreadStateThriftMessageConverter();
30+
private final MessageConverter<Object, TThreadState> threadStateMessageConverter = new ThreadStateThriftMessageConverter();
3131

3232
@Override
3333
public TThreadDump toMessage(Object message) {

0 commit comments

Comments
 (0)