Skip to content

Commit da60ef9

Browse files
emeroademeroad
committed
[#9932] Remove thrift dependency of Agent module
1 parent 97fc92a commit da60ef9

File tree

240 files changed

+1190
-7888
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+1190
-7888
lines changed

‎bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/DefaultProfilerConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class DefaultProfilerConfig implements ProfilerConfig {
4747

4848
private final Properties properties;
4949

50-
private static final TransportModule DEFAULT_TRANSPORT_MODULE = TransportModule.THRIFT;
50+
private static final TransportModule DEFAULT_TRANSPORT_MODULE = TransportModule.GRPC;
5151

5252
@Value("${profiler.enable:true}")
5353
private boolean profileEnable = false;

‎bootstraps/bootstrap-core/src/main/java/com/navercorp/pinpoint/bootstrap/config/TransportModule.java

+4-9
Original file line numberDiff line numberDiff line change
@@ -22,24 +22,19 @@
2222
* @author Woonduk Kang(emeroad)
2323
*/
2424
public enum TransportModule {
25-
THRIFT,
2625
GRPC;
2726

2827
public static TransportModule parse(String transportModule) {
2928
Objects.requireNonNull(transportModule, "transportModule");
3029

31-
if (isEquals(THRIFT, transportModule)) {
32-
return THRIFT;
33-
}
34-
if (isEquals(GRPC, transportModule)) {
30+
if (equalsIgnoreCase(TransportModule.GRPC.name(), transportModule)) {
3531
return GRPC;
3632
}
37-
return null;
33+
return GRPC;
3834
}
3935

40-
private static boolean isEquals(TransportModule transportModule, String transportModuleString) {
41-
final String transportModuleName = transportModule.name();
42-
return transportModuleName.equalsIgnoreCase(transportModuleString);
36+
private static boolean equalsIgnoreCase(String str1, String str2) {
37+
return str1.equalsIgnoreCase(str2);
4338
}
4439

4540
public static TransportModule parse(String transportModule, TransportModule defaultModule) {

‎bootstraps/bootstrap-core/src/test/java/com/navercorp/pinpoint/bootstrap/config/TransportModuleTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ public class TransportModuleTest {
2727
@Test
2828
public void parse() {
2929
Assertions.assertEquals(TransportModule.parse("GRPC"), TransportModule.GRPC);
30-
Assertions.assertEquals(TransportModule.parse("THRIFT"), TransportModule.THRIFT);
3130

32-
Assertions.assertNull(TransportModule.parse("ERROR"));
31+
Assertions.assertEquals(TransportModule.parse("ERROR"), TransportModule.GRPC);
3332
}
3433

3534
@Test

‎collector/pom.xml

+4
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@
7070
<groupId>com.navercorp.pinpoint</groupId>
7171
<artifactId>pinpoint-thrift</artifactId>
7272
</dependency>
73+
<dependency>
74+
<groupId>com.navercorp.pinpoint</groupId>
75+
<artifactId>thrift-datasender</artifactId>
76+
</dependency>
7377
<dependency>
7478
<groupId>com.navercorp.pinpoint</groupId>
7579
<artifactId>pinpoint-grpc</artifactId>

‎collector/src/main/java/com/navercorp/pinpoint/collector/cluster/ClusterPoint.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.navercorp.pinpoint.collector.cluster;
1818

1919
import com.navercorp.pinpoint.common.server.cluster.ClusterKey;
20-
import com.navercorp.pinpoint.rpc.ResponseMessage;
20+
import com.navercorp.pinpoint.io.ResponseMessage;
2121
import org.apache.thrift.TBase;
2222

2323
import java.util.concurrent.CompletableFuture;

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
import com.navercorp.pinpoint.common.server.cluster.ClusterKey;
2121
import com.navercorp.pinpoint.rpc.common.SocketStateCode;
2222
import com.navercorp.pinpoint.rpc.server.PinpointServer;
23-
24-
import org.apache.logging.log4j.Logger;
2523
import org.apache.logging.log4j.LogManager;
24+
import org.apache.logging.log4j.Logger;
2625

2726
import java.util.ArrayList;
2827
import java.util.HashMap;

‎collector/src/main/java/com/navercorp/pinpoint/collector/cluster/GrpcAgentConnection.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
package com.navercorp.pinpoint.collector.cluster;
1818

1919
import com.google.protobuf.GeneratedMessageV3;
20+
import com.navercorp.pinpoint.collector.cluster.grpc.CommandThriftToGrpcMessageConverter;
2021
import com.navercorp.pinpoint.collector.receiver.grpc.PinpointGrpcServer;
2122
import com.navercorp.pinpoint.common.server.cluster.ClusterKey;
22-
import com.navercorp.pinpoint.profiler.context.grpc.CommandThriftToGrpcMessageConverter;
23+
import com.navercorp.pinpoint.io.ResponseMessage;
2324
import com.navercorp.pinpoint.rpc.PinpointSocketException;
24-
import com.navercorp.pinpoint.rpc.ResponseMessage;
2525
import com.navercorp.pinpoint.rpc.packet.stream.StreamCode;
2626
import com.navercorp.pinpoint.rpc.stream.ClientStreamChannel;
2727
import com.navercorp.pinpoint.rpc.stream.ClientStreamChannelEventHandler;
@@ -117,4 +117,4 @@ public String toString() {
117117
return String.format("GrpcAgentConnection {clusterKey: %s}", pinpointGrpcServer.getClusterKey());
118118
}
119119

120-
}
120+
}

‎collector/src/main/java/com/navercorp/pinpoint/collector/cluster/ThriftAgentConnection.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package com.navercorp.pinpoint.collector.cluster;
1818

1919
import com.navercorp.pinpoint.common.server.cluster.ClusterKey;
20-
import com.navercorp.pinpoint.rpc.ResponseMessage;
20+
import com.navercorp.pinpoint.io.ResponseMessage;
2121
import com.navercorp.pinpoint.rpc.server.ChannelProperties;
2222
import com.navercorp.pinpoint.rpc.server.PinpointServer;
2323
import com.navercorp.pinpoint.thrift.io.TCommandType;

‎collector/src/main/java/com/navercorp/pinpoint/collector/cluster/flink/FlinkClusterConnectionManager.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919
import com.navercorp.pinpoint.collector.sender.FlinkRequestFactory;
2020
import com.navercorp.pinpoint.collector.sender.FlinkTcpDataSender;
2121
import com.navercorp.pinpoint.collector.util.Address;
22-
import com.navercorp.pinpoint.profiler.sender.TcpDataSender;
2322
import com.navercorp.pinpoint.rpc.client.DefaultPinpointClientFactory;
2423
import com.navercorp.pinpoint.rpc.client.PinpointClientFactory;
2524
import com.navercorp.pinpoint.thrift.io.HeaderTBaseSerializer;
2625
import com.navercorp.pinpoint.thrift.io.SerializerFactory;
26+
import com.navercorp.pinpoint.thrift.sender.TcpDataSender;
2727
import org.apache.logging.log4j.LogManager;
2828
import org.apache.logging.log4j.Logger;
2929
import org.apache.thrift.TBase;

‎collector/src/main/java/com/navercorp/pinpoint/collector/cluster/flink/SenderContext.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
*/
1616
package com.navercorp.pinpoint.collector.cluster.flink;
1717

18-
import com.navercorp.pinpoint.profiler.sender.TcpDataSender;
18+
import com.navercorp.pinpoint.thrift.sender.TcpDataSender;
1919
import org.apache.thrift.TBase;
2020

2121
import java.util.Objects;

‎collector/src/main/java/com/navercorp/pinpoint/collector/cluster/flink/TcpDataSenderRepository.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
import com.navercorp.pinpoint.collector.service.SendDataToFlinkService;
1919
import com.navercorp.pinpoint.collector.util.Address;
20-
import com.navercorp.pinpoint.profiler.sender.TcpDataSender;
20+
import com.navercorp.pinpoint.thrift.sender.TcpDataSender;
2121
import org.apache.thrift.TBase;
2222

2323
import java.util.ArrayList;

‎profiler/src/main/java/com/navercorp/pinpoint/profiler/context/grpc/CommandThriftToGrpcMessageConverter.java renamed to ‎collector/src/main/java/com/navercorp/pinpoint/collector/cluster/grpc/CommandThriftToGrpcMessageConverter.java

+86-87
Original file line numberDiff line numberDiff line change
@@ -1,87 +1,86 @@
1-
/*
2-
* Copyright 2019 NAVER Corp.
3-
*
4-
* Licensed under the Apache License, Version 2.0 (the "License");
5-
* you may not use this file except in compliance with the License.
6-
* You may obtain a copy of the License at
7-
*
8-
* http://www.apache.org/licenses/LICENSE-2.0
9-
*
10-
* Unless required by applicable law or agreed to in writing, software
11-
* distributed under the License is distributed on an "AS IS" BASIS,
12-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
* See the License for the specific language governing permissions and
14-
* limitations under the License.
15-
*/
16-
17-
package com.navercorp.pinpoint.profiler.context.grpc;
18-
19-
import com.navercorp.pinpoint.grpc.trace.PCmdActiveThreadCount;
20-
import com.navercorp.pinpoint.grpc.trace.PCmdActiveThreadDump;
21-
import com.navercorp.pinpoint.grpc.trace.PCmdActiveThreadLightDump;
22-
import com.navercorp.pinpoint.grpc.trace.PCmdEcho;
23-
import com.navercorp.pinpoint.profiler.context.thrift.MessageConverter;
24-
import com.navercorp.pinpoint.thrift.dto.command.TCmdActiveThreadCount;
25-
import com.navercorp.pinpoint.thrift.dto.command.TCmdActiveThreadDump;
26-
import com.navercorp.pinpoint.thrift.dto.command.TCmdActiveThreadLightDump;
27-
import com.navercorp.pinpoint.thrift.dto.command.TCommandEcho;
28-
29-
import com.google.protobuf.GeneratedMessageV3;
30-
31-
/**
32-
* @author Taejin Koo
33-
*/
34-
public class CommandThriftToGrpcMessageConverter implements MessageConverter<Object, GeneratedMessageV3> {
35-
36-
@Override
37-
public GeneratedMessageV3 toMessage(Object message) {
38-
if (message instanceof TCommandEcho) {
39-
return buildPCommandEcho((TCommandEcho) message);
40-
} else if (message instanceof TCmdActiveThreadCount) {
41-
return buildPCmdActiveThreadCount((TCmdActiveThreadCount) message);
42-
} else if (message instanceof TCmdActiveThreadDump) {
43-
return buildPCmdActiveThreadDump((TCmdActiveThreadDump) message);
44-
} else if (message instanceof TCmdActiveThreadLightDump) {
45-
return buildPCmdActiveThreadLightDump((TCmdActiveThreadLightDump) message);
46-
}
47-
return null;
48-
}
49-
50-
private PCmdEcho buildPCommandEcho(TCommandEcho tCommandEcho) {
51-
PCmdEcho.Builder builder = PCmdEcho.newBuilder();
52-
builder.setMessage(tCommandEcho.getMessage());
53-
return builder.build();
54-
}
55-
56-
private PCmdActiveThreadCount buildPCmdActiveThreadCount(TCmdActiveThreadCount tCmdActiveThreadCount) {
57-
PCmdActiveThreadCount.Builder builder = PCmdActiveThreadCount.newBuilder();
58-
return builder.build();
59-
}
60-
61-
private PCmdActiveThreadDump buildPCmdActiveThreadDump(TCmdActiveThreadDump tCmdActiveThreadDump) {
62-
PCmdActiveThreadDump.Builder builder = PCmdActiveThreadDump.newBuilder();
63-
builder.setLimit(tCmdActiveThreadDump.getLimit());
64-
if (tCmdActiveThreadDump.isSetLocalTraceIdList()) {
65-
builder.addAllLocalTraceId(tCmdActiveThreadDump.getLocalTraceIdList());
66-
}
67-
if (tCmdActiveThreadDump.isSetThreadNameList()) {
68-
builder.addAllThreadName(tCmdActiveThreadDump.getThreadNameList());
69-
}
70-
71-
return builder.build();
72-
}
73-
74-
private PCmdActiveThreadLightDump buildPCmdActiveThreadLightDump(TCmdActiveThreadLightDump tCmdActiveThreadLightDump) {
75-
PCmdActiveThreadLightDump.Builder builder = PCmdActiveThreadLightDump.newBuilder();
76-
builder.setLimit(tCmdActiveThreadLightDump.getLimit());
77-
if (tCmdActiveThreadLightDump.isSetLocalTraceIdList()) {
78-
builder.addAllLocalTraceId(tCmdActiveThreadLightDump.getLocalTraceIdList());
79-
}
80-
if (tCmdActiveThreadLightDump.isSetThreadNameList()) {
81-
builder.addAllThreadName(tCmdActiveThreadLightDump.getThreadNameList());
82-
}
83-
84-
return builder.build();
85-
}
86-
87-
}
1+
/*
2+
* Copyright 2019 NAVER Corp.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
package com.navercorp.pinpoint.collector.cluster.grpc;
18+
19+
import com.google.protobuf.GeneratedMessageV3;
20+
import com.navercorp.pinpoint.common.profiler.message.MessageConverter;
21+
import com.navercorp.pinpoint.grpc.trace.PCmdActiveThreadCount;
22+
import com.navercorp.pinpoint.grpc.trace.PCmdActiveThreadDump;
23+
import com.navercorp.pinpoint.grpc.trace.PCmdActiveThreadLightDump;
24+
import com.navercorp.pinpoint.grpc.trace.PCmdEcho;
25+
import com.navercorp.pinpoint.thrift.dto.command.TCmdActiveThreadCount;
26+
import com.navercorp.pinpoint.thrift.dto.command.TCmdActiveThreadDump;
27+
import com.navercorp.pinpoint.thrift.dto.command.TCmdActiveThreadLightDump;
28+
import com.navercorp.pinpoint.thrift.dto.command.TCommandEcho;
29+
30+
/**
31+
* @author Taejin Koo
32+
*/
33+
public class CommandThriftToGrpcMessageConverter implements MessageConverter<Object, GeneratedMessageV3> {
34+
35+
@Override
36+
public GeneratedMessageV3 toMessage(Object message) {
37+
if (message instanceof TCommandEcho) {
38+
return buildPCommandEcho((TCommandEcho) message);
39+
} else if (message instanceof TCmdActiveThreadCount) {
40+
return buildPCmdActiveThreadCount((TCmdActiveThreadCount) message);
41+
} else if (message instanceof TCmdActiveThreadDump) {
42+
return buildPCmdActiveThreadDump((TCmdActiveThreadDump) message);
43+
} else if (message instanceof TCmdActiveThreadLightDump) {
44+
return buildPCmdActiveThreadLightDump((TCmdActiveThreadLightDump) message);
45+
}
46+
return null;
47+
}
48+
49+
private PCmdEcho buildPCommandEcho(TCommandEcho tCommandEcho) {
50+
PCmdEcho.Builder builder = PCmdEcho.newBuilder();
51+
builder.setMessage(tCommandEcho.getMessage());
52+
return builder.build();
53+
}
54+
55+
private PCmdActiveThreadCount buildPCmdActiveThreadCount(TCmdActiveThreadCount tCmdActiveThreadCount) {
56+
PCmdActiveThreadCount.Builder builder = PCmdActiveThreadCount.newBuilder();
57+
return builder.build();
58+
}
59+
60+
private PCmdActiveThreadDump buildPCmdActiveThreadDump(TCmdActiveThreadDump tCmdActiveThreadDump) {
61+
PCmdActiveThreadDump.Builder builder = PCmdActiveThreadDump.newBuilder();
62+
builder.setLimit(tCmdActiveThreadDump.getLimit());
63+
if (tCmdActiveThreadDump.isSetLocalTraceIdList()) {
64+
builder.addAllLocalTraceId(tCmdActiveThreadDump.getLocalTraceIdList());
65+
}
66+
if (tCmdActiveThreadDump.isSetThreadNameList()) {
67+
builder.addAllThreadName(tCmdActiveThreadDump.getThreadNameList());
68+
}
69+
70+
return builder.build();
71+
}
72+
73+
private PCmdActiveThreadLightDump buildPCmdActiveThreadLightDump(TCmdActiveThreadLightDump tCmdActiveThreadLightDump) {
74+
PCmdActiveThreadLightDump.Builder builder = PCmdActiveThreadLightDump.newBuilder();
75+
builder.setLimit(tCmdActiveThreadLightDump.getLimit());
76+
if (tCmdActiveThreadLightDump.isSetLocalTraceIdList()) {
77+
builder.addAllLocalTraceId(tCmdActiveThreadLightDump.getLocalTraceIdList());
78+
}
79+
if (tCmdActiveThreadLightDump.isSetThreadNameList()) {
80+
builder.addAllThreadName(tCmdActiveThreadLightDump.getThreadNameList());
81+
}
82+
83+
return builder.build();
84+
}
85+
86+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.navercorp.pinpoint.collector.cluster.GrpcAgentConnection;
2222
import com.navercorp.pinpoint.collector.cluster.ThriftAgentConnection;
2323
import com.navercorp.pinpoint.collector.cluster.route.filter.RouteFilter;
24-
import com.navercorp.pinpoint.rpc.ResponseMessage;
24+
import com.navercorp.pinpoint.io.ResponseMessage;
2525
import com.navercorp.pinpoint.thrift.dto.command.TCommandTransferResponse;
2626
import com.navercorp.pinpoint.thrift.dto.command.TRouteResult;
2727
import org.apache.commons.lang3.ArrayUtils;

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

+2-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@
3535
import com.navercorp.pinpoint.thrift.io.HeaderTBaseSerializer;
3636
import com.navercorp.pinpoint.thrift.io.SerializerFactory;
3737
import com.navercorp.pinpoint.thrift.util.SerializationUtils;
38-
39-
import org.apache.thrift.TBase;
40-
import org.apache.logging.log4j.Logger;
4138
import org.apache.logging.log4j.LogManager;
39+
import org.apache.logging.log4j.Logger;
40+
import org.apache.thrift.TBase;
4241
import org.springframework.beans.factory.annotation.Qualifier;
4342

4443
import java.util.Objects;

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
import com.navercorp.pinpoint.common.server.cluster.ClusterKey;
2626
import com.navercorp.pinpoint.common.util.Assert;
2727
import com.navercorp.pinpoint.common.util.StringUtils;
28+
import com.navercorp.pinpoint.io.ResponseMessage;
2829
import com.navercorp.pinpoint.io.request.Message;
2930
import com.navercorp.pinpoint.rpc.PinpointSocketException;
30-
import com.navercorp.pinpoint.rpc.ResponseMessage;
3131
import com.navercorp.pinpoint.rpc.common.SocketStateCode;
3232
import com.navercorp.pinpoint.thrift.dto.command.TCommandEcho;
3333
import com.navercorp.pinpoint.thrift.io.CommandHeaderTBaseDeserializerFactory;

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@
2828
import com.navercorp.pinpoint.grpc.trace.PCmdEcho;
2929
import com.navercorp.pinpoint.grpc.trace.PCmdRequest;
3030
import com.navercorp.pinpoint.grpc.trace.PCmdResponse;
31-
import com.navercorp.pinpoint.profiler.context.thrift.CommandGrpcToThriftMessageConverter;
31+
import com.navercorp.pinpoint.io.ResponseMessage;
3232
import com.navercorp.pinpoint.rpc.PinpointSocketException;
33-
import com.navercorp.pinpoint.rpc.ResponseMessage;
3433
import com.navercorp.pinpoint.rpc.client.RequestManager;
3534
import com.navercorp.pinpoint.rpc.common.SocketState;
3635
import com.navercorp.pinpoint.rpc.common.SocketStateChangeResult;
@@ -45,6 +44,7 @@
4544
import com.navercorp.pinpoint.rpc.stream.StreamException;
4645
import com.navercorp.pinpoint.thrift.dto.command.TRouteResult;
4746
import com.navercorp.pinpoint.thrift.io.CommandHeaderTBaseSerializerFactory;
47+
import com.navercorp.pinpoint.thrift.sender.message.CommandGrpcToThriftMessageConverter;
4848
import com.navercorp.pinpoint.thrift.util.SerializationUtils;
4949
import io.grpc.Status;
5050
import io.grpc.StatusException;

‎collector/src/main/java/com/navercorp/pinpoint/collector/sender/FlinkTcpDataSender.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
package com.navercorp.pinpoint.collector.sender;
1717

1818
import com.navercorp.pinpoint.io.request.FlinkRequest;
19-
import com.navercorp.pinpoint.profiler.sender.TcpDataSender;
2019
import com.navercorp.pinpoint.rpc.client.PinpointClientFactory;
2120
import com.navercorp.pinpoint.thrift.io.TBaseSerializer;
22-
import org.apache.thrift.TBase;
23-
import org.apache.logging.log4j.Logger;
21+
import com.navercorp.pinpoint.thrift.sender.TcpDataSender;
2422
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
24+
import org.apache.thrift.TBase;
2525
import org.springframework.util.Assert;
2626

2727
import java.util.HashMap;

‎collector/src/main/java/com/navercorp/pinpoint/collector/service/SendDataToFlinkService.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package com.navercorp.pinpoint.collector.service;
1717

18-
import com.navercorp.pinpoint.profiler.sender.TcpDataSender;
19-
import org.apache.thrift.TBase;
20-
import org.apache.logging.log4j.Logger;
18+
import com.navercorp.pinpoint.thrift.sender.TcpDataSender;
2119
import org.apache.logging.log4j.LogManager;
20+
import org.apache.logging.log4j.Logger;
21+
import org.apache.thrift.TBase;
2222

2323
import java.util.ArrayList;
2424
import java.util.List;

0 commit comments

Comments
 (0)