Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
93468c96
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 搜索 >>
未验证
提交
93468c96
编写于
12月 07, 2022
作者:
J
Jiajing LU
提交者:
GitHub
12月 07, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into optimize-banyandb-measure-integration
上级
29a7043a
210c3749
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
6 addition
and
4 deletion
+6
-4
docs/en/changes/changes.md
docs/en/changes/changes.md
+1
-0
oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/ZipkinSpanHTTPHandler.java
...server/receiver/zipkin/handler/ZipkinSpanHTTPHandler.java
+5
-4
未找到文件。
docs/en/changes/changes.md
浏览文件 @
93468c96
...
...
@@ -29,6 +29,7 @@
*
Remove abandon logic in MergableBufferedData, which caused unexpected no-update.
*
Fix miss set
`LastUpdateTimestamp`
that caused the metrics session to expire.
*
Rename MAL rule
`spring-sleuth.yaml`
to
`spring-micrometer.yaml`
.
*
Fix memory leak in Zipkin API.
#### UI
...
...
oap-server/server-receiver-plugin/zipkin-receiver-plugin/src/main/java/org/apache/skywalking/oap/server/receiver/zipkin/handler/ZipkinSpanHTTPHandler.java
浏览文件 @
93468c96
...
...
@@ -100,10 +100,11 @@ public class ZipkinSpanHTTPHandler {
final
HttpRequest
req
)
{
final
HistogramMetrics
.
Timer
timer
=
histogram
.
createTimer
();
final
HttpResponse
response
=
HttpResponse
.
from
(
req
.
aggregate
().
thenApply
(
request
->
{
final
HttpData
httpData
=
UnzippingBytesRequestConverter
.
convertRequest
(
ctx
,
request
);
final
List
<
Span
>
spanList
=
decoder
.
decodeList
(
httpData
.
byteBuf
().
nioBuffer
());
spanForward
.
send
(
spanList
);
return
HttpResponse
.
of
(
HttpStatus
.
OK
);
try
(
final
HttpData
httpData
=
UnzippingBytesRequestConverter
.
convertRequest
(
ctx
,
request
))
{
final
List
<
Span
>
spanList
=
decoder
.
decodeList
(
httpData
.
byteBuf
().
nioBuffer
());
spanForward
.
send
(
spanList
);
return
HttpResponse
.
of
(
HttpStatus
.
OK
);
}
}));
response
.
whenComplete
().
handle
((
unused
,
throwable
)
->
{
if
(
nonNull
(
throwable
))
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录