Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
6b9ef38a
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,发现更多精彩内容 >>
未验证
提交
6b9ef38a
编写于
11月 06, 2017
作者:
wu-sheng
提交者:
GitHub
11月 06, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' into master
上级
f74ea2fd
329e53ca
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
138 addition
and
4 deletion
+138
-4
README.md
README.md
+1
-1
README_ZH.md
README_ZH.md
+1
-1
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentSpanListener.java
...ream/worker/node/component/NodeComponentSpanListener.java
+2
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingSpanListener.java
...ntstream/worker/node/mapping/NodeMappingSpanListener.java
+1
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceSpanListener.java
...agentstream/worker/noderef/NodeReferenceSpanListener.java
+3
-0
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceSpanListener.java
...tream/worker/serviceref/ServiceReferenceSpanListener.java
+3
-0
apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc3ConnectionInstrumentation.java
...dbc/postgresql/define/Jdbc3ConnectionInstrumentation.java
+2
-2
apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc4ConnectionInstrumentation.java
...dbc/postgresql/define/Jdbc4ConnectionInstrumentation.java
+124
-0
apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/resources/skywalking-plugin.def
...resql-8.x-plugin/src/main/resources/skywalking-plugin.def
+1
-0
未找到文件。
README.md
浏览文件 @
6b9ef38a
...
...
@@ -64,7 +64,7 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU
[
Open Skywalking Organization Teams and Contributors
](
https://github.com/OpenSkywalking/Organization/blob/master/README.md
)
# Partners
<img
src=
"https://skywalkingtest.github.io/page-resources/3.2.
3/partners.png"
width=
"6
00"
/>
<img
src=
"https://skywalkingtest.github.io/page-resources/3.2.
4/partners.png"
width=
"8
00"
/>
# License
[
Apache 2.0 License.
](
/LICENSE
)
README_ZH.md
浏览文件 @
6b9ef38a
...
...
@@ -68,7 +68,7 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU
[
Open Skywalking Organization Teams and Contributors
](
https://github.com/OpenSkywalking/Organization/blob/master/README.md
)
# Partners
<img
src=
"https://skywalkingtest.github.io/page-resources/3.2.
3/partners.png"
width=
"6
00"
/>
<img
src=
"https://skywalkingtest.github.io/page-resources/3.2.
4/partners.png"
width=
"8
00"
/>
# License
[
Apache 2.0 License.
](
/LICENSE
)
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentSpanListener.java
浏览文件 @
6b9ef38a
...
...
@@ -60,6 +60,7 @@ public class NodeComponentSpanListener implements EntrySpanListener, ExitSpanLis
}
nodeComponent
.
setPeerId
(
spanDecorator
.
getPeerId
());
nodeComponent
.
setPeer
(
Const
.
EMPTY_STRING
);
id
=
id
+
Const
.
ID_SPLIT
+
nodeComponent
.
getPeerId
();
nodeComponent
.
setId
(
id
);
nodeComponents
.
add
(
nodeComponent
);
...
...
@@ -81,6 +82,7 @@ public class NodeComponentSpanListener implements EntrySpanListener, ExitSpanLis
}
nodeComponent
.
setPeerId
(
applicationId
);
nodeComponent
.
setPeer
(
Const
.
EMPTY_STRING
);
id
=
id
+
Const
.
ID_SPLIT
+
String
.
valueOf
(
applicationId
);
nodeComponent
.
setId
(
id
);
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingSpanListener.java
浏览文件 @
6b9ef38a
...
...
@@ -51,6 +51,7 @@ public class NodeMappingSpanListener implements RefsListener, FirstSpanListener
NodeMappingDataDefine
.
NodeMapping
nodeMapping
=
new
NodeMappingDataDefine
.
NodeMapping
();
nodeMapping
.
setApplicationId
(
applicationId
);
nodeMapping
.
setAddressId
(
referenceDecorator
.
getNetworkAddressId
());
nodeMapping
.
setAddress
(
Const
.
EMPTY_STRING
);
String
id
=
String
.
valueOf
(
applicationId
)
+
Const
.
ID_SPLIT
+
String
.
valueOf
(
nodeMapping
.
getAddressId
());
nodeMapping
.
setId
(
id
);
nodeMappings
.
add
(
nodeMapping
);
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceSpanListener.java
浏览文件 @
6b9ef38a
...
...
@@ -53,6 +53,7 @@ public class NodeReferenceSpanListener implements EntrySpanListener, ExitSpanLis
NodeReferenceDataDefine
.
NodeReference
nodeReference
=
new
NodeReferenceDataDefine
.
NodeReference
();
nodeReference
.
setFrontApplicationId
(
applicationId
);
nodeReference
.
setBehindApplicationId
(
spanDecorator
.
getPeerId
());
nodeReference
.
setBehindPeer
(
Const
.
EMPTY_STRING
);
nodeReference
.
setTimeBucket
(
TimeBucketUtils
.
INSTANCE
.
getMinuteTimeBucket
(
spanDecorator
.
getStartTime
()));
StringBuilder
idBuilder
=
new
StringBuilder
();
...
...
@@ -79,6 +80,7 @@ public class NodeReferenceSpanListener implements EntrySpanListener, ExitSpanLis
NodeReferenceDataDefine
.
NodeReference
nodeReference
=
new
NodeReferenceDataDefine
.
NodeReference
();
nodeReference
.
setFrontApplicationId
(
Const
.
USER_ID
);
nodeReference
.
setBehindApplicationId
(
applicationId
);
nodeReference
.
setBehindPeer
(
Const
.
EMPTY_STRING
);
nodeReference
.
setTimeBucket
(
TimeBucketUtils
.
INSTANCE
.
getMinuteTimeBucket
(
spanDecorator
.
getStartTime
()));
String
idBuilder
=
String
.
valueOf
(
nodeReference
.
getTimeBucket
())
+
Const
.
ID_SPLIT
+
nodeReference
.
getFrontApplicationId
()
+
...
...
@@ -96,6 +98,7 @@ public class NodeReferenceSpanListener implements EntrySpanListener, ExitSpanLis
NodeReferenceDataDefine
.
NodeReference
referenceSum
=
new
NodeReferenceDataDefine
.
NodeReference
();
referenceSum
.
setFrontApplicationId
(
parentApplicationId
);
referenceSum
.
setBehindApplicationId
(
applicationId
);
referenceSum
.
setBehindPeer
(
Const
.
EMPTY_STRING
);
references
.
add
(
referenceSum
);
}
...
...
apm-collector/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceSpanListener.java
浏览文件 @
6b9ef38a
...
...
@@ -127,12 +127,15 @@ public class ServiceReferenceSpanListener implements FirstSpanListener, EntrySpa
idBuilder
.
append
(
entryServiceId
).
append
(
Const
.
ID_SPLIT
);
serviceReference
.
setEntryServiceId
(
entryServiceId
);
serviceReference
.
setEntryServiceName
(
Const
.
EMPTY_STRING
);
idBuilder
.
append
(
frontServiceId
).
append
(
Const
.
ID_SPLIT
);
serviceReference
.
setFrontServiceId
(
frontServiceId
);
serviceReference
.
setFrontServiceName
(
Const
.
EMPTY_STRING
);
idBuilder
.
append
(
behindServiceId
);
serviceReference
.
setBehindServiceId
(
behindServiceId
);
serviceReference
.
setBehindServiceName
(
Const
.
EMPTY_STRING
);
serviceReference
.
setId
(
idBuilder
.
toString
());
serviceReference
.
setTimeBucket
(
timeBucket
);
...
...
apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc3ConnectionInstrumentation.java
浏览文件 @
6b9ef38a
...
...
@@ -41,8 +41,8 @@ import static org.skywalking.apm.plugin.jdbc.define.Constants.ROLLBACK_METHOD_NA
import
static
org
.
skywalking
.
apm
.
plugin
.
jdbc
.
define
.
Constants
.
SERVICE_METHOD_INTERCEPT_CLASS
;
/**
* {@link ConnectionInstrumentation} intercept the following methods that the class which extend {@link
* org.postgresql.jdbc
.Pg
Connection}. <br/>
* {@link
Jdbc3
ConnectionInstrumentation} intercept the following methods that the class which extend {@link
* org.postgresql.jdbc
3.Jdbc3
Connection}. <br/>
*
* 1. Enhance <code>prepareStatement</code> by <code>org.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor</code>
* 2. Enhance <code>prepareCall</code> by
...
...
apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/postgresql/define/Jdbc4ConnectionInstrumentation.java
0 → 100644
浏览文件 @
6b9ef38a
/*
* Copyright 2017, OpenSkywalking Organization All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Project repository: https://github.com/OpenSkywalking/skywalking
*/
package
org.skywalking.apm.plugin.jdbc.postgresql.define
;
import
net.bytebuddy.description.method.MethodDescription
;
import
net.bytebuddy.matcher.ElementMatcher
;
import
org.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint
;
import
org.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint
;
import
org.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine
;
import
org.skywalking.apm.agent.core.plugin.match.ClassMatch
;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
named
;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
takesArguments
;
import
static
org
.
skywalking
.
apm
.
agent
.
core
.
plugin
.
match
.
NameMatch
.
byName
;
import
static
org
.
skywalking
.
apm
.
plugin
.
jdbc
.
define
.
Constants
.
CLOSE_METHOD_NAME
;
import
static
org
.
skywalking
.
apm
.
plugin
.
jdbc
.
define
.
Constants
.
COMMIT_METHOD_NAME
;
import
static
org
.
skywalking
.
apm
.
plugin
.
jdbc
.
define
.
Constants
.
CREATE_STATEMENT_INTERCEPT_CLASS
;
import
static
org
.
skywalking
.
apm
.
plugin
.
jdbc
.
define
.
Constants
.
CREATE_STATEMENT_METHOD_NAME
;
import
static
org
.
skywalking
.
apm
.
plugin
.
jdbc
.
define
.
Constants
.
PREPARE_CALL_INTERCEPT_CLASS
;
import
static
org
.
skywalking
.
apm
.
plugin
.
jdbc
.
define
.
Constants
.
PREPARE_CALL_METHOD_NAME
;
import
static
org
.
skywalking
.
apm
.
plugin
.
jdbc
.
define
.
Constants
.
PREPARE_STATEMENT_INTERCEPT_CLASS
;
import
static
org
.
skywalking
.
apm
.
plugin
.
jdbc
.
define
.
Constants
.
PREPARE_STATEMENT_METHOD_NAME
;
import
static
org
.
skywalking
.
apm
.
plugin
.
jdbc
.
define
.
Constants
.
RELEASE_SAVE_POINT_METHOD_NAME
;
import
static
org
.
skywalking
.
apm
.
plugin
.
jdbc
.
define
.
Constants
.
ROLLBACK_METHOD_NAME
;
import
static
org
.
skywalking
.
apm
.
plugin
.
jdbc
.
define
.
Constants
.
SERVICE_METHOD_INTERCEPT_CLASS
;
/**
* {@link Jdbc4ConnectionInstrumentation} intercept the following methods that the class which extend {@link
* org.postgresql.jdbc4.Jdbc4Connection}. <br/>
*
* 1. Enhance <code>prepareStatement</code> by <code>org.skywalking.apm.plugin.jdbc.define.JDBCPrepareStatementInterceptor</code>
* 2. Enhance <code>prepareCall</code> by
* <code>org.skywalking.apm.plugin.jdbc.define.JDBCPrepareCallInterceptor</code>
* 3. Enhance <code>createStatement</code>
* by <code>org.skywalking.apm.plugin.jdbc.define.JDBCStatementInterceptor</code>
* 4. Enhance <code>commit, rollback, close, releaseSavepoint</code> by <code>org.skywalking.apm.plugin.jdbc.define.ConnectionServiceMethodInterceptor</code>
*
* @author zhangxin
*/
public
class
Jdbc4ConnectionInstrumentation
extends
ClassInstanceMethodsEnhancePluginDefine
{
public
static
final
String
ENHANCE_CLASS
=
"org.postgresql.jdbc4.Jdbc4Connection"
;
@Override
protected
ConstructorInterceptPoint
[]
getConstructorsInterceptPoints
()
{
return
new
ConstructorInterceptPoint
[
0
];
}
@Override
protected
InstanceMethodsInterceptPoint
[]
getInstanceMethodsInterceptPoints
()
{
return
new
InstanceMethodsInterceptPoint
[]
{
new
InstanceMethodsInterceptPoint
()
{
@Override
public
ElementMatcher
<
MethodDescription
>
getMethodsMatcher
()
{
return
named
(
PREPARE_STATEMENT_METHOD_NAME
).
and
(
takesArguments
(
4
));
}
@Override
public
String
getMethodsInterceptor
()
{
return
PREPARE_STATEMENT_INTERCEPT_CLASS
;
}
@Override
public
boolean
isOverrideArgs
()
{
return
false
;
}
},
new
InstanceMethodsInterceptPoint
()
{
@Override
public
ElementMatcher
<
MethodDescription
>
getMethodsMatcher
()
{
return
named
(
PREPARE_CALL_METHOD_NAME
).
and
(
takesArguments
(
4
));
}
@Override
public
String
getMethodsInterceptor
()
{
return
PREPARE_CALL_INTERCEPT_CLASS
;
}
@Override
public
boolean
isOverrideArgs
()
{
return
false
;
}
},
new
InstanceMethodsInterceptPoint
()
{
@Override
public
ElementMatcher
<
MethodDescription
>
getMethodsMatcher
()
{
return
named
(
CREATE_STATEMENT_METHOD_NAME
).
and
(
takesArguments
(
3
));
}
@Override
public
String
getMethodsInterceptor
()
{
return
CREATE_STATEMENT_INTERCEPT_CLASS
;
}
@Override
public
boolean
isOverrideArgs
()
{
return
false
;
}
},
new
InstanceMethodsInterceptPoint
()
{
@Override
public
ElementMatcher
<
MethodDescription
>
getMethodsMatcher
()
{
return
named
(
COMMIT_METHOD_NAME
).
or
(
named
(
ROLLBACK_METHOD_NAME
)).
or
(
named
(
CLOSE_METHOD_NAME
)).
or
(
named
(
RELEASE_SAVE_POINT_METHOD_NAME
));
}
@Override
public
String
getMethodsInterceptor
()
{
return
SERVICE_METHOD_INTERCEPT_CLASS
;
}
@Override
public
boolean
isOverrideArgs
()
{
return
false
;
}
}
};
}
@Override
protected
ClassMatch
enhanceClass
()
{
return
byName
(
ENHANCE_CLASS
);
}
}
apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/resources/skywalking-plugin.def
浏览文件 @
6b9ef38a
postgresql-8.x=org.skywalking.apm.plugin.jdbc.postgresql.define.DriverInstrumentation
postgresql-8.x=org.skywalking.apm.plugin.jdbc.postgresql.define.Jdbc3ConnectionInstrumentation
postgresql-8.x=org.skywalking.apm.plugin.jdbc.postgresql.define.Jdbc4ConnectionInstrumentation
postgresql-8.x=org.skywalking.apm.plugin.jdbc.postgresql.define.ConnectionInstrumentation
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录