Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
javalover123888
SkyWalking
提交
85acc1b1
S
SkyWalking
项目概览
javalover123888
/
SkyWalking
与 Fork 源项目一致
Fork自
山不在高_有仙则灵 / SkyWalking
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SkyWalking
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
85acc1b1
编写于
6月 24, 2019
作者:
wu-sheng
提交者:
GitHub
6月 24, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "Introduce dead line settings from gRPC document. (#2917)" (#2936)
This reverts commit
db8c4546
.
上级
129d2918
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
11 addition
and
19 deletion
+11
-19
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java
.../org/apache/skywalking/apm/agent/core/jvm/JVMService.java
+1
-1
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceAndEndpointRegisterClient.java
...m/agent/core/remote/ServiceAndEndpointRegisterClient.java
+2
-2
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java
...king/apm/agent/core/remote/TraceSegmentServiceClient.java
+6
-12
oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java
...lking/oap/server/exporter/provider/grpc/GRPCExporter.java
+1
-2
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java
...lking/oap/server/core/remote/client/GRPCRemoteClient.java
+1
-2
未找到文件。
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/jvm/JVMService.java
浏览文件 @
85acc1b1
...
...
@@ -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
;
}
...
...
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/ServiceAndEndpointRegisterClient.java
浏览文件 @
85acc1b1
...
...
@@ -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
;
...
...
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/remote/TraceSegmentServiceClient.java
浏览文件 @
85acc1b1
...
...
@@ -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
;
}
...
...
oap-server/exporter/src/main/java/org/apache/skywalking/oap/server/exporter/provider/grpc/GRPCExporter.java
浏览文件 @
85acc1b1
...
...
@@ -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
);
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java
浏览文件 @
85acc1b1
...
...
@@ -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
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录