Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
7f9f7922
S
SkyWalking
项目概览
apache
/
SkyWalking
上一次同步 1 年多
通知
302
Star
21345
Fork
6091
代码
文件
提交
分支
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
7f9f7922
编写于
10月 26, 2022
作者:
M
Marc Navarro
提交者:
GitHub
10月 26, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Do not log grpc envoy receiver client-side streaming cancellation as errors (#9843)
上级
2cdcb0d7
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
88 addition
and
0 deletion
+88
-0
docs/en/changes/changes.md
docs/en/changes/changes.md
+2
-0
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandler.java
...ywalking/oap/server/core/remote/RemoteServiceHandler.java
+8
-0
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
+8
-0
oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/AccessLogServiceGRPCHandler.java
...ap/server/receiver/envoy/AccessLogServiceGRPCHandler.java
+8
-0
oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java
...g/oap/server/receiver/envoy/MetricServiceGRPCHandler.java
+8
-0
oap-server/server-receiver-plugin/skywalking-ebpf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/ebpf/provider/handler/EBPFProfilingServiceHandler.java
...er/ebpf/provider/handler/EBPFProfilingServiceHandler.java
+8
-0
oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/grpc/EventGrpcServiceHandler.java
...p/server/receiver/event/grpc/EventGrpcServiceHandler.java
+7
-0
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshGRPCHandler.java
.../skywalking/aop/server/receiver/mesh/MeshGRPCHandler.java
+8
-0
oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/handler/MeterServiceHandler.java
.../receiver/meter/provider/handler/MeterServiceHandler.java
+15
-0
oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/provider/handler/ProfileTaskServiceHandler.java
...r/profile/provider/handler/ProfileTaskServiceHandler.java
+8
-0
oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v8/grpc/TraceSegmentReportServiceHandler.java
...der/handler/v8/grpc/TraceSegmentReportServiceHandler.java
+8
-0
未找到文件。
docs/en/changes/changes.md
浏览文件 @
7f9f7922
...
...
@@ -69,6 +69,8 @@
*
[
**Breaking Change**
] Support new records query protocol, rename the column named
`service_id`
to
`entity_id`
for support difference entity.
Please re-create
`top_n_database_statement`
index/table.
*
Remove improper self-obs metrics in JvmMetricsHandler(for Kafka channel).
*
gRPC stream canceling code is not logged as an error when the client cancels the stream. The client
cancels the stream when the pod is terminated.
#### UI
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/RemoteServiceHandler.java
浏览文件 @
7f9f7922
...
...
@@ -18,6 +18,7 @@
package
org.apache.skywalking.oap.server.core.remote
;
import
io.grpc.Status
;
import
io.grpc.stub.StreamObserver
;
import
java.util.Objects
;
import
org.apache.skywalking.oap.server.core.CoreModule
;
...
...
@@ -141,6 +142,13 @@ public class RemoteServiceHandler extends RemoteServiceGrpc.RemoteServiceImplBas
@Override
public
void
onError
(
Throwable
throwable
)
{
Status
status
=
Status
.
fromThrowable
(
throwable
);
if
(
Status
.
CANCELLED
.
getCode
()
==
status
.
getCode
())
{
if
(
LOGGER
.
isDebugEnabled
())
{
LOGGER
.
debug
(
throwable
.
getMessage
(),
throwable
);
}
return
;
}
LOGGER
.
error
(
throwable
.
getMessage
(),
throwable
);
}
...
...
oap-server/server-core/src/main/java/org/apache/skywalking/oap/server/core/remote/client/GRPCRemoteClient.java
浏览文件 @
7f9f7922
...
...
@@ -19,6 +19,7 @@
package
org.apache.skywalking.oap.server.core.remote.client
;
import
io.grpc.ManagedChannel
;
import
io.grpc.Status
;
import
io.grpc.stub.StreamObserver
;
import
io.netty.handler.ssl.SslContext
;
import
java.util.List
;
...
...
@@ -222,6 +223,13 @@ public class GRPCRemoteClient implements RemoteClient {
@Override
public
void
onError
(
Throwable
throwable
)
{
concurrentStreamObserverNumber
.
addAndGet
(-
1
);
Status
status
=
Status
.
fromThrowable
(
throwable
);
if
(
Status
.
CANCELLED
.
getCode
()
==
status
.
getCode
())
{
if
(
log
.
isDebugEnabled
())
{
log
.
debug
(
throwable
.
getMessage
(),
throwable
);
}
return
;
}
log
.
error
(
throwable
.
getMessage
(),
throwable
);
}
...
...
oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/AccessLogServiceGRPCHandler.java
浏览文件 @
7f9f7922
...
...
@@ -23,6 +23,7 @@ import io.envoyproxy.envoy.data.accesslog.v3.TCPAccessLogEntry;
import
io.envoyproxy.envoy.service.accesslog.v2.AccessLogServiceGrpc
;
import
io.envoyproxy.envoy.service.accesslog.v3.StreamAccessLogsMessage
;
import
io.envoyproxy.envoy.service.accesslog.v3.StreamAccessLogsResponse
;
import
io.grpc.Status
;
import
io.grpc.stub.StreamObserver
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
@@ -170,6 +171,13 @@ public class AccessLogServiceGRPCHandler extends AccessLogServiceGrpc.AccessLogS
@Override
public
void
onError
(
Throwable
throwable
)
{
Status
status
=
Status
.
fromThrowable
(
throwable
);
if
(
Status
.
CANCELLED
.
getCode
()
==
status
.
getCode
())
{
if
(
LOGGER
.
isDebugEnabled
())
{
LOGGER
.
debug
(
"Envoy client cancelled sending access logs"
,
throwable
);
}
return
;
}
LOGGER
.
error
(
"Error in receiving access log from envoy"
,
throwable
);
}
...
...
oap-server/server-receiver-plugin/envoy-metrics-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/envoy/MetricServiceGRPCHandler.java
浏览文件 @
7f9f7922
...
...
@@ -21,6 +21,7 @@ package org.apache.skywalking.oap.server.receiver.envoy;
import
io.envoyproxy.envoy.service.metrics.v2.MetricsServiceGrpc
;
import
io.envoyproxy.envoy.service.metrics.v3.StreamMetricsMessage
;
import
io.envoyproxy.envoy.service.metrics.v3.StreamMetricsResponse
;
import
io.grpc.Status
;
import
io.grpc.stub.StreamObserver
;
import
io.prometheus.client.Metrics
;
import
java.util.ArrayList
;
...
...
@@ -129,6 +130,13 @@ public class MetricServiceGRPCHandler extends MetricsServiceGrpc.MetricsServiceI
@Override
public
void
onError
(
Throwable
throwable
)
{
Status
status
=
Status
.
fromThrowable
(
throwable
);
if
(
Status
.
CANCELLED
.
getCode
()
==
status
.
getCode
())
{
if
(
log
.
isDebugEnabled
())
{
log
.
error
(
"Envoy client cancelled sending metrics"
,
throwable
);
}
return
;
}
log
.
error
(
"Error in receiving metrics from envoy"
,
throwable
);
}
...
...
oap-server/server-receiver-plugin/skywalking-ebpf-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/ebpf/provider/handler/EBPFProfilingServiceHandler.java
浏览文件 @
7f9f7922
...
...
@@ -19,6 +19,7 @@
package
org.apache.skywalking.oap.server.receiver.ebpf.provider.handler
;
import
com.google.common.base.Joiner
;
import
io.grpc.Status
;
import
io.grpc.stub.StreamObserver
;
import
io.vavr.Tuple
;
import
io.vavr.Tuple2
;
...
...
@@ -187,6 +188,13 @@ public class EBPFProfilingServiceHandler extends EBPFProfilingServiceGrpc.EBPFPr
@Override
public
void
onError
(
Throwable
throwable
)
{
Status
status
=
Status
.
fromThrowable
(
throwable
);
if
(
Status
.
CANCELLED
.
getCode
()
==
status
.
getCode
())
{
if
(
log
.
isDebugEnabled
())
{
log
.
debug
(
throwable
.
getMessage
(),
throwable
);
}
return
;
}
log
.
error
(
"Error in receiving ebpf profiling data"
,
throwable
);
}
...
...
oap-server/server-receiver-plugin/skywalking-event-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/event/grpc/EventGrpcServiceHandler.java
浏览文件 @
7f9f7922
...
...
@@ -93,6 +93,13 @@ public class EventGrpcServiceHandler extends EventServiceGrpc.EventServiceImplBa
@Override
public
void
onError
(
Throwable
throwable
)
{
Status
status
=
Status
.
fromThrowable
(
throwable
);
if
(
Status
.
CANCELLED
.
getCode
()
==
status
.
getCode
())
{
if
(
log
.
isDebugEnabled
())
{
log
.
debug
(
throwable
.
getMessage
(),
throwable
);
}
return
;
}
log
.
error
(
throwable
.
getMessage
(),
throwable
);
}
...
...
oap-server/server-receiver-plugin/skywalking-mesh-receiver-plugin/src/main/java/org/apache/skywalking/aop/server/receiver/mesh/MeshGRPCHandler.java
浏览文件 @
7f9f7922
...
...
@@ -18,6 +18,7 @@
package
org.apache.skywalking.aop.server.receiver.mesh
;
import
io.grpc.Status
;
import
io.grpc.stub.StreamObserver
;
import
org.apache.skywalking.apm.network.servicemesh.v3.MeshProbeDownstream
;
import
org.apache.skywalking.apm.network.servicemesh.v3.ServiceMeshMetric
;
...
...
@@ -47,6 +48,13 @@ public class MeshGRPCHandler extends ServiceMeshMetricServiceGrpc.ServiceMeshMet
@Override
public
void
onError
(
Throwable
throwable
)
{
Status
status
=
Status
.
fromThrowable
(
throwable
);
if
(
Status
.
CANCELLED
.
getCode
()
==
status
.
getCode
())
{
if
(
LOGGER
.
isDebugEnabled
())
{
LOGGER
.
debug
(
throwable
.
getMessage
(),
throwable
);
}
return
;
}
LOGGER
.
error
(
throwable
.
getMessage
(),
throwable
);
}
...
...
oap-server/server-receiver-plugin/skywalking-meter-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/meter/provider/handler/MeterServiceHandler.java
浏览文件 @
7f9f7922
...
...
@@ -18,6 +18,7 @@
package
org.apache.skywalking.oap.server.receiver.meter.provider.handler
;
import
io.grpc.Status
;
import
io.grpc.stub.StreamObserver
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.skywalking.apm.network.common.v3.Commands
;
...
...
@@ -76,6 +77,13 @@ public class MeterServiceHandler extends MeterReportServiceGrpc.MeterReportServi
@Override
public
void
onError
(
Throwable
throwable
)
{
processor
.
process
();
Status
status
=
Status
.
fromThrowable
(
throwable
);
if
(
Status
.
CANCELLED
.
getCode
()
==
status
.
getCode
())
{
if
(
log
.
isDebugEnabled
())
{
log
.
debug
(
throwable
.
getMessage
(),
throwable
);
}
return
;
}
log
.
error
(
throwable
.
getMessage
(),
throwable
);
}
...
...
@@ -105,6 +113,13 @@ public class MeterServiceHandler extends MeterReportServiceGrpc.MeterReportServi
@Override
public
void
onError
(
Throwable
throwable
)
{
Status
status
=
Status
.
fromThrowable
(
throwable
);
if
(
Status
.
CANCELLED
.
getCode
()
==
status
.
getCode
())
{
if
(
log
.
isDebugEnabled
())
{
log
.
debug
(
throwable
.
getMessage
(),
throwable
);
}
return
;
}
log
.
error
(
throwable
.
getMessage
(),
throwable
);
}
...
...
oap-server/server-receiver-plugin/skywalking-profile-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/profile/provider/handler/ProfileTaskServiceHandler.java
浏览文件 @
7f9f7922
...
...
@@ -18,6 +18,7 @@
package
org.apache.skywalking.oap.server.receiver.profile.provider.handler
;
import
io.grpc.Status
;
import
io.grpc.stub.StreamObserver
;
import
java.util.List
;
import
java.util.concurrent.TimeUnit
;
...
...
@@ -111,6 +112,13 @@ public class ProfileTaskServiceHandler extends ProfileTaskGrpc.ProfileTaskImplBa
@Override
public
void
onError
(
Throwable
throwable
)
{
Status
status
=
Status
.
fromThrowable
(
throwable
);
if
(
Status
.
CANCELLED
.
getCode
()
==
status
.
getCode
())
{
if
(
LOGGER
.
isDebugEnabled
())
{
LOGGER
.
debug
(
throwable
.
getMessage
(),
throwable
);
}
return
;
}
LOGGER
.
error
(
throwable
.
getMessage
(),
throwable
);
}
...
...
oap-server/server-receiver-plugin/skywalking-trace-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/trace/provider/handler/v8/grpc/TraceSegmentReportServiceHandler.java
浏览文件 @
7f9f7922
...
...
@@ -18,6 +18,7 @@
package
org.apache.skywalking.oap.server.receiver.trace.provider.handler.v8.grpc
;
import
io.grpc.Status
;
import
io.grpc.stub.StreamObserver
;
import
lombok.extern.slf4j.Slf4j
;
import
org.apache.skywalking.apm.network.common.v3.Commands
;
...
...
@@ -80,6 +81,13 @@ public class TraceSegmentReportServiceHandler extends TraceSegmentReportServiceG
@Override
public
void
onError
(
Throwable
throwable
)
{
Status
status
=
Status
.
fromThrowable
(
throwable
);
if
(
Status
.
CANCELLED
.
getCode
()
==
status
.
getCode
())
{
if
(
log
.
isDebugEnabled
())
{
log
.
debug
(
throwable
.
getMessage
(),
throwable
);
}
return
;
}
log
.
error
(
throwable
.
getMessage
(),
throwable
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录