This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking.git
The following commit(s) were added to refs/heads/master by this push:
new 85acc1b Revert "Introduce dead line settings from gRPC document.
(#2917)" (#2936)
85acc1b is described below
commit 85acc1b191f97b3cf2e283bf18f5daaf6264704f
Author: 吴晟 Wu Sheng <[email protected]>
AuthorDate: Mon Jun 24 00:08:59 2019 +0800
Revert "Introduce dead line settings from gRPC document. (#2917)" (#2936)
This reverts commit db8c45465bfcc95d50dbfb586e48068ef9ec419d.
---
.../skywalking/apm/agent/core/jvm/JVMService.java | 2 +-
.../core/remote/ServiceAndEndpointRegisterClient.java | 4 ++--
.../agent/core/remote/TraceSegmentServiceClient.java | 18 ++++++------------
.../server/exporter/provider/grpc/GRPCExporter.java | 3 +--
.../server/core/remote/client/GRPCRemoteClient.java | 3 +--
5 files changed, 11 insertions(+), 19 deletions(-)
diff --git
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java
index c94d2d6..791375f 100644
---
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java
+++
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java
@@ -151,7 +151,7 @@ public class JVMService implements BootService, Runnable {
public void statusChanged(GRPCChannelStatus status) {
if (GRPCChannelStatus.CONNECTED.equals(status)) {
Channel channel =
ServiceManager.INSTANCE.findService(GRPCChannelManager.class).getChannel();
- stub =
JVMMetricReportServiceGrpc.newBlockingStub(channel).withDeadlineAfter(10,
TimeUnit.SECONDS);
+ stub = JVMMetricReportServiceGrpc.newBlockingStub(channel);
}
this.status = status;
}
diff --git
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceAndEndpointRegisterClient.java
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceAndEndpointRegisterClient.java
index 6687c30..b3e29de 100644
---
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceAndEndpointRegisterClient.java
+++
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceAndEndpointRegisterClient.java
@@ -65,8 +65,8 @@ public class ServiceAndEndpointRegisterClient implements
BootService, Runnable,
public void statusChanged(GRPCChannelStatus status) {
if (GRPCChannelStatus.CONNECTED.equals(status)) {
Channel channel =
ServiceManager.INSTANCE.findService(GRPCChannelManager.class).getChannel();
- registerBlockingStub =
RegisterGrpc.newBlockingStub(channel).withDeadlineAfter(10, TimeUnit.SECONDS);
- serviceInstancePingStub =
ServiceInstancePingGrpc.newBlockingStub(channel).withDeadlineAfter(10,
TimeUnit.SECONDS);
+ registerBlockingStub = RegisterGrpc.newBlockingStub(channel);
+ serviceInstancePingStub =
ServiceInstancePingGrpc.newBlockingStub(channel);
} else {
registerBlockingStub = null;
serviceInstancePingStub = null;
diff --git
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java
index 817273e..221d982 100644
---
a/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java
+++
b/apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java
@@ -21,24 +21,18 @@ package org.apache.skywalking.apm.agent.core.remote;
import io.grpc.Channel;
import io.grpc.stub.StreamObserver;
import java.util.List;
-import java.util.concurrent.TimeUnit;
-import org.apache.skywalking.apm.agent.core.boot.BootService;
-import org.apache.skywalking.apm.agent.core.boot.DefaultImplementor;
-import org.apache.skywalking.apm.agent.core.boot.ServiceManager;
-import org.apache.skywalking.apm.agent.core.context.TracingContext;
-import org.apache.skywalking.apm.agent.core.context.TracingContextListener;
+import org.apache.skywalking.apm.agent.core.boot.*;
+import org.apache.skywalking.apm.agent.core.context.*;
import org.apache.skywalking.apm.agent.core.context.trace.TraceSegment;
-import org.apache.skywalking.apm.agent.core.logging.api.ILog;
-import org.apache.skywalking.apm.agent.core.logging.api.LogManager;
+import org.apache.skywalking.apm.agent.core.logging.api.*;
import org.apache.skywalking.apm.commons.datacarrier.DataCarrier;
import org.apache.skywalking.apm.commons.datacarrier.buffer.BufferStrategy;
import org.apache.skywalking.apm.commons.datacarrier.consumer.IConsumer;
import org.apache.skywalking.apm.network.common.Commands;
-import org.apache.skywalking.apm.network.language.agent.UpstreamSegment;
+import org.apache.skywalking.apm.network.language.agent.*;
import
org.apache.skywalking.apm.network.language.agent.v2.TraceSegmentReportServiceGrpc;
-import static
org.apache.skywalking.apm.agent.core.conf.Config.Buffer.BUFFER_SIZE;
-import static
org.apache.skywalking.apm.agent.core.conf.Config.Buffer.CHANNEL_SIZE;
+import static org.apache.skywalking.apm.agent.core.conf.Config.Buffer.*;
import static
org.apache.skywalking.apm.agent.core.remote.GRPCChannelStatus.CONNECTED;
/**
@@ -172,7 +166,7 @@ public class TraceSegmentServiceClient implements
BootService, IConsumer<TraceSe
public void statusChanged(GRPCChannelStatus status) {
if (CONNECTED.equals(status)) {
Channel channel =
ServiceManager.INSTANCE.findService(GRPCChannelManager.class).getChannel();
- serviceStub =
TraceSegmentReportServiceGrpc.newStub(channel).withDeadlineAfter(10,
TimeUnit.SECONDS);
+ serviceStub = TraceSegmentReportServiceGrpc.newStub(channel);
}
this.status = status;
}
diff --git
a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java
b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java
index 7458479..2e28322 100644
---
a/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java
+++
b/oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java
@@ -21,7 +21,6 @@ package
org.apache.skywalking.oap.server.exporter.provider.grpc;
import io.grpc.ManagedChannel;
import io.grpc.stub.StreamObserver;
import java.util.*;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import lombok.*;
import org.apache.skywalking.apm.commons.datacarrier.DataCarrier;
@@ -50,7 +49,7 @@ public class GRPCExporter extends MetricFormatter implements
MetricValuesExportS
GRPCClient client = new GRPCClient(setting.getTargetHost(),
setting.getTargetPort());
client.connect();
ManagedChannel channel = client.getChannel();
- exportServiceFutureStub =
MetricExportServiceGrpc.newStub(channel).withDeadlineAfter(10,
TimeUnit.SECONDS);
+ exportServiceFutureStub = MetricExportServiceGrpc.newStub(channel);
blockingStub = MetricExportServiceGrpc.newBlockingStub(channel);
exportBuffer = new
DataCarrier<ExportData>(setting.getBufferChannelNum(),
setting.getBufferChannelSize());
exportBuffer.consume(this, 1, 200);
diff --git
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java
index 924c1c5..6a920a5 100644
---
a/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java
+++
b/oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java
@@ -21,7 +21,6 @@ package org.apache.skywalking.oap.server.core.remote.client;
import io.grpc.ManagedChannel;
import io.grpc.stub.StreamObserver;
import java.util.*;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.skywalking.apm.commons.datacarrier.DataCarrier;
import org.apache.skywalking.apm.commons.datacarrier.buffer.BufferStrategy;
@@ -101,7 +100,7 @@ public class GRPCRemoteClient implements RemoteClient {
}
RemoteServiceGrpc.RemoteServiceStub getStub() {
- return RemoteServiceGrpc.newStub(getChannel()).withDeadlineAfter(10,
TimeUnit.SECONDS);
+ return RemoteServiceGrpc.newStub(getChannel());
}
DataCarrier<RemoteMessage> getDataCarrier() {
