Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
月轩居士
SkyWalking
提交
ea8a4963
S
SkyWalking
项目概览
月轩居士
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
4
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,发现更多精彩内容 >>
未验证
提交
ea8a4963
编写于
1月 18, 2021
作者:
R
ralphgj
提交者:
GitHub
1月 18, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix recording url tag with wrong port (#6214)
上级
4e43f227
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
7 addition
and
6 deletion
+7
-6
CHANGES.md
CHANGES.md
+1
-0
apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/RestExecuteInterceptor.java
...gin/spring/resttemplate/async/RestExecuteInterceptor.java
+2
-2
apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestExecuteInterceptor.java
...ugin/spring/resttemplate/sync/RestExecuteInterceptor.java
+2
-2
test/plugin/scenarios/jdk-threading-scenario/config/expectedData.yaml
...scenarios/jdk-threading-scenario/config/expectedData.yaml
+2
-2
未找到文件。
CHANGES.md
浏览文件 @
ea8a4963
...
...
@@ -34,6 +34,7 @@ Release Notes.
*
Fix duplicated
`EnhancedInstance`
interface added.
*
Fix thread leaks caused by the elasticsearch-6.x-plugin plugin.
*
Support reading segmentId and spanId with toolkit.
*
Fix RestTemplate plugin recording url tag with wrong port
#### OAP-Backend
...
...
apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/async/RestExecuteInterceptor.java
浏览文件 @
ea8a4963
...
...
@@ -50,8 +50,8 @@ public class RestExecuteInterceptor implements InstanceMethodsAroundInterceptor
AbstractSpan
span
=
ContextManager
.
createExitSpan
(
uri
,
contextCarrier
,
remotePeer
);
span
.
setComponent
(
ComponentsDefine
.
SPRING_REST_TEMPLATE
);
Tags
.
URL
.
set
(
span
,
requestURL
.
getScheme
()
+
"://"
+
requestURL
.
getHost
()
+
":"
+
requestURL
.
getPort
()
+
requestURL
.
getPath
());
Tags
.
URL
.
set
(
span
,
requestURL
.
getScheme
()
+
"://"
+
requestURL
.
getHost
()
+
(
requestURL
.
getPort
()
>
0
?
":"
+
requestURL
.
getPort
()
:
""
)
+
requestURL
.
getPath
());
Tags
.
HTTP
.
METHOD
.
set
(
span
,
httpMethod
.
toString
());
SpanLayer
.
asHttp
(
span
);
RestTemplateRuntimeContextHelper
.
addUri
(
uri
);
...
...
apm-sniffer/apm-sdk-plugin/spring-plugins/resttemplate-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/resttemplate/sync/RestExecuteInterceptor.java
浏览文件 @
ea8a4963
...
...
@@ -46,8 +46,8 @@ public class RestExecuteInterceptor implements InstanceMethodsAroundInterceptor
AbstractSpan
span
=
ContextManager
.
createExitSpan
(
formatURIPath
,
contextCarrier
,
remotePeer
);
span
.
setComponent
(
ComponentsDefine
.
SPRING_REST_TEMPLATE
);
Tags
.
URL
.
set
(
span
,
requestURL
.
getScheme
()
+
"://"
+
requestURL
.
getHost
()
+
":"
+
requestURL
.
getPort
()
+
requestURL
.
getPath
());
Tags
.
URL
.
set
(
span
,
requestURL
.
getScheme
()
+
"://"
+
requestURL
.
getHost
()
+
(
requestURL
.
getPort
()
>
0
?
":"
+
requestURL
.
getPort
()
:
""
)
+
requestURL
.
getPath
());
Tags
.
HTTP
.
METHOD
.
set
(
span
,
httpMethod
.
toString
());
SpanLayer
.
asHttp
(
span
);
...
...
test/plugin/scenarios/jdk-threading-scenario/config/expectedData.yaml
浏览文件 @
ea8a4963
...
...
@@ -48,7 +48,7 @@ segmentItems:
spanType
:
Exit
peer
:
github.com:443
tags
:
-
{
key
:
url
,
value
:
'
https://github.com
:-1
/apache/skywalking'
}
-
{
key
:
url
,
value
:
'
https://github.com/apache/skywalking'
}
-
{
key
:
http.method
,
value
:
GET
}
skipAnalysis
:
'
false'
-
operationName
:
Threading/test.apache.skywalking.apm.testcase.jdk.threading.Application$TestController$1/run
...
...
@@ -81,7 +81,7 @@ segmentItems:
spanType
:
Exit
peer
:
github.com:443
tags
:
-
{
key
:
url
,
value
:
'
https://github.com
:-1
/apache/skywalking'
}
-
{
key
:
url
,
value
:
'
https://github.com/apache/skywalking'
}
-
{
key
:
http.method
,
value
:
GET
}
skipAnalysis
:
'
false'
-
operationName
:
Threading/test.apache.skywalking.apm.testcase.jdk.threading.Application$TestController$2/call
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录