Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
阿信在这里
SkyWalking
提交
edaaa305
S
SkyWalking
项目概览
阿信在这里
/
SkyWalking
与 Fork 源项目一致
Fork自
山不在高_有仙则灵 / SkyWalking
通知
1
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,发现更多精彩内容 >>
提交
edaaa305
编写于
9月 27, 2017
作者:
wu-sheng
提交者:
GitHub
9月 27, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #472 from ascrutae/fix/log-encode-issue
fix log encode issue and check style failured
上级
96593af3
d68fa5f6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
5 addition
and
30 deletion
+5
-30
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/EasyLogger.java
...ava/org/skywalking/apm/agent/core/logging/EasyLogger.java
+5
-7
apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/skywalking/apm/plugin/jetty/v9/client/CompleteListenerInterceptor.java
...m/plugin/jetty/v9/client/CompleteListenerInterceptor.java
+0
-3
apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/test/java/org/skywalking/apm/plugin/jetty/v9/client/CompleteListenerInterceptorTest.java
...ugin/jetty/v9/client/CompleteListenerInterceptorTest.java
+0
-20
未找到文件。
apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/logging/EasyLogger.java
浏览文件 @
edaaa305
package
org.skywalking.apm.agent.core.logging
;
import
org.skywalking.apm.agent.core.conf.Config
;
import
org.skywalking.apm.agent.core.conf.Constants
;
import
org.skywalking.apm.util.StringUtil
;
import
org.skywalking.apm.logging.ILog
;
import
java.io.ByteArrayOutputStream
;
import
java.io.IOException
;
import
java.net.URLEncoder
;
import
java.text.SimpleDateFormat
;
import
java.util.Date
;
import
org.skywalking.apm.agent.core.conf.Config
;
import
org.skywalking.apm.agent.core.conf.Constants
;
import
org.skywalking.apm.logging.ILog
;
import
org.skywalking.apm.util.StringUtil
;
/**
* The <code>EasyLogger</code> is a simple implementation of {@link ILog}.
...
...
@@ -38,7 +36,7 @@ public class EasyLogger implements ILog {
break
;
}
tmpMessage
=
tmpMessage
.
replaceFirst
(
"\\{\\}"
,
URLEncoder
.
encode
(
String
.
valueOf
(
parameters
[
parametersIndex
++])
));
tmpMessage
=
tmpMessage
.
replaceFirst
(
"\\{\\}"
,
String
.
valueOf
(
parameters
[
parametersIndex
++]
));
startSize
=
index
+
2
;
}
return
tmpMessage
;
...
...
apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/main/java/org/skywalking/apm/plugin/jetty/v9/client/CompleteListenerInterceptor.java
浏览文件 @
edaaa305
...
...
@@ -2,9 +2,6 @@ package org.skywalking.apm.plugin.jetty.v9.client;
import
java.lang.reflect.Method
;
import
org.eclipse.jetty.client.api.Result
;
import
org.eclipse.jetty.http.HttpFields
;
import
org.skywalking.apm.agent.core.context.CarrierItem
;
import
org.skywalking.apm.agent.core.context.ContextCarrier
;
import
org.skywalking.apm.agent.core.context.ContextManager
;
import
org.skywalking.apm.agent.core.context.ContextSnapshot
;
import
org.skywalking.apm.agent.core.context.tag.Tags
;
...
...
apm-sniffer/apm-sdk-plugin/jetty-plugin/jetty-client-9.x-plugin/src/test/java/org/skywalking/apm/plugin/jetty/v9/client/CompleteListenerInterceptorTest.java
浏览文件 @
edaaa305
...
...
@@ -13,13 +13,10 @@ import org.mockito.Mock;
import
org.powermock.modules.junit4.PowerMockRunner
;
import
org.powermock.modules.junit4.PowerMockRunnerDelegate
;
import
org.skywalking.apm.agent.core.context.ContextSnapshot
;
import
org.skywalking.apm.agent.core.context.SW3CarrierItem
;
import
org.skywalking.apm.agent.core.context.ids.DistributedTraceId
;
import
org.skywalking.apm.agent.core.context.ids.ID
;
import
org.skywalking.apm.agent.core.context.trace.TraceSegment
;
import
org.skywalking.apm.agent.core.context.trace.TraceSegmentRef
;
import
org.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance
;
import
org.skywalking.apm.agent.test.helper.SegmentRefHelper
;
import
org.skywalking.apm.agent.test.tools.AgentServiceRule
;
import
org.skywalking.apm.agent.test.tools.SegmentStorage
;
import
org.skywalking.apm.agent.test.tools.SegmentStoragePoint
;
...
...
@@ -110,21 +107,4 @@ public class CompleteListenerInterceptorTest {
TraceSegment
traceSegment
=
segmentStorage
.
getTraceSegments
().
get
(
0
);
assertThat
(
traceSegment
.
getRefs
().
size
(),
is
(
1
));
}
@Test
public
void
testMethodAroundWithSnapshotAndHeader
()
throws
Throwable
{
HttpFields
fields
=
new
HttpFields
();
fields
.
put
(
SW3CarrierItem
.
HEADER_NAME
,
"1.234.111|3|1|1|#192.168.1.8:18002|#/portal/|#/testEntrySpan|#AQA*#AQA*Et0We0tQNQA*"
);
when
(
httpResponse
.
getHeaders
()).
thenReturn
(
fields
);
interceptor
.
beforeMethod
(
objectInstanceWithSnapshot
,
null
,
allArguments
,
argumentTypes
,
null
);
interceptor
.
afterMethod
(
objectInstanceWithSnapshot
,
null
,
allArguments
,
argumentTypes
,
null
);
assertThat
(
segmentStorage
.
getTraceSegments
().
size
(),
is
(
1
));
TraceSegment
traceSegment
=
segmentStorage
.
getTraceSegments
().
get
(
0
);
assertThat
(
traceSegment
.
getRefs
().
size
(),
is
(
1
));
TraceSegmentRef
ref
=
traceSegment
.
getRefs
().
get
(
0
);
assertThat
(
SegmentRefHelper
.
getEntryApplicationInstanceId
(
ref
),
is
(
1
));
assertThat
(
SegmentRefHelper
.
getSpanId
(
ref
),
is
(
3
));
assertThat
(
SegmentRefHelper
.
getTraceSegmentId
(
ref
).
toString
(),
is
(
"1.234.111"
));
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录