Skip to content

Commit 6a8d5f1

Browse files
committed
[#9932] Removed thrift dependency of Agent module`
1 parent 38b6629 commit 6a8d5f1

File tree

4 files changed

+22
-14
lines changed

4 files changed

+22
-14
lines changed

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ public enum TransportModule {
2626

2727
public static TransportModule parse(String transportModule) {
2828
Objects.requireNonNull(transportModule, "transportModule");
29-
if (isEquals(GRPC, transportModule)) {
29+
30+
if (equalsIgnoreCase(TransportModule.GRPC.name(), transportModule)) {
3031
return GRPC;
3132
}
3233
return GRPC;
3334
}
3435

35-
private static boolean isEquals(TransportModule transportModule, String transportModuleString) {
36-
final String transportModuleName = transportModule.name();
37-
return transportModuleName.equalsIgnoreCase(transportModuleString);
36+
private static boolean equalsIgnoreCase(String str1, String str2) {
37+
return str1.equalsIgnoreCase(str2);
3838
}
3939

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

profiler/src/main/java/com/navercorp/pinpoint/profiler/receiver/grpc/GrpcCommandService.java

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

1717
package com.navercorp.pinpoint.profiler.receiver.grpc;
1818

19-
import java.util.Objects;
2019
import com.navercorp.pinpoint.grpc.StatusError;
2120
import com.navercorp.pinpoint.grpc.StatusErrors;
2221
import com.navercorp.pinpoint.grpc.client.SupportCommandCodeClientInterceptor;
@@ -27,11 +26,12 @@
2726
import com.navercorp.pinpoint.profiler.sender.grpc.ReconnectExecutor;
2827
import com.navercorp.pinpoint.profiler.sender.grpc.Reconnector;
2928
import com.navercorp.pinpoint.profiler.sender.grpc.StreamUtils;
30-
3129
import io.grpc.stub.ClientCallStreamObserver;
3230
import io.grpc.stub.ClientResponseObserver;
33-
import org.apache.logging.log4j.Logger;
3431
import org.apache.logging.log4j.LogManager;
32+
import org.apache.logging.log4j.Logger;
33+
34+
import java.util.Objects;
3535

3636
/**
3737
* @author Taejin Koo
@@ -157,14 +157,14 @@ public void onError(Throwable t) {
157157
@Override
158158
public void onCompleted() {
159159
logger.info("onCompleted");
160-
StreamUtils.close(requestStream);
160+
StreamUtils.close(requestStream, GrpcCommandService.this.logger);
161161
// TODO : needs to check whether needs new action
162162
reserveReconnect();
163163
}
164164

165165
private void stop() {
166166
logger.info("stop");
167-
StreamUtils.close(requestStream);
167+
StreamUtils.close(requestStream, GrpcCommandService.this.logger);
168168
commandDispatcher.close();
169169
}
170170

profiler/src/main/java/com/navercorp/pinpoint/profiler/sender/grpc/PingStreamContext.java

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

1717
package com.navercorp.pinpoint.profiler.sender.grpc;
1818

19-
import java.util.Objects;
2019
import com.navercorp.pinpoint.grpc.MessageFormatUtils;
2120
import com.navercorp.pinpoint.grpc.StatusError;
2221
import com.navercorp.pinpoint.grpc.StatusErrors;
@@ -25,9 +24,10 @@
2524
import io.grpc.stub.ClientCallStreamObserver;
2625
import io.grpc.stub.ClientResponseObserver;
2726
import io.grpc.stub.StreamObserver;
28-
import org.apache.logging.log4j.Logger;
2927
import org.apache.logging.log4j.LogManager;
28+
import org.apache.logging.log4j.Logger;
3029

30+
import java.util.Objects;
3131
import java.util.concurrent.RejectedExecutionException;
3232
import java.util.concurrent.ScheduledExecutorService;
3333
import java.util.concurrent.ScheduledFuture;
@@ -140,7 +140,7 @@ private ScheduledFuture<?> schedule(Runnable command) {
140140

141141
public void close() {
142142
logger.info("{} close()", streamId);
143-
StreamUtils.close(this.requestObserver);
143+
StreamUtils.close(this.requestObserver, this.logger);
144144
}
145145

146146
@Override

profiler/src/main/java/com/navercorp/pinpoint/profiler/sender/grpc/StreamUtils.java

+10-2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
package com.navercorp.pinpoint.profiler.sender.grpc;
1818

1919
import io.grpc.stub.StreamObserver;
20+
import org.apache.logging.log4j.Logger;
21+
2022

2123
/**
2224
* @author Woonduk Kang(emeroad)
@@ -26,9 +28,15 @@ public final class StreamUtils {
2628
private StreamUtils() {
2729
}
2830

29-
public static void close(final StreamObserver<?> streamObserver) {
31+
public static void close(final StreamObserver<?> streamObserver, Logger logger) {
3032
if (streamObserver != null) {
31-
streamObserver.onCompleted();
33+
try {
34+
streamObserver.onCompleted();
35+
} catch (Throwable th) {
36+
if (logger != null) {
37+
logger.info("StreamObserver.onCompleted error", th);
38+
}
39+
}
3240
}
3341
}
3442
}

0 commit comments

Comments
 (0)