Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
SkyWalking
提交
2713b5fd
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 搜索 >>
未验证
提交
2713b5fd
编写于
1月 11, 2018
作者:
wu-sheng
提交者:
GitHub
1月 11, 2018
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #743 from ascrutae/support/postgresql-jdbc
[Agent] Support jdbc4, jdbc3 and jdbc42 of postgresql driver
上级
36136911
c6e593f6
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
28 addition
and
15 deletion
+28
-15
apm-sniffer/apm-agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match/MultiClassNameMatch.java
...king/apm/agent/core/plugin/match/MultiClassNameMatch.java
+1
-3
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/CallableInstrumentation.java
...apm/plugin/jdbc/mysql/define/CallableInstrumentation.java
+1
-1
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/DriverInstrumentation.java
...g/apm/plugin/jdbc/mysql/define/DriverInstrumentation.java
+1
-1
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/Mysql5xConnectionInstrumentation.java
...n/jdbc/mysql/define/Mysql5xConnectionInstrumentation.java
+1
-1
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/PreparedStatementInstrumentation.java
...n/jdbc/mysql/define/PreparedStatementInstrumentation.java
+1
-1
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/StatementInstrumentation.java
...pm/plugin/jdbc/mysql/define/StatementInstrumentation.java
+1
-1
apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java
...tgresql/define/AbstractJdbc2StatementInstrumentation.java
+16
-4
apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/ConnectionInstrumentation.java
...gin/jdbc/postgresql/define/ConnectionInstrumentation.java
+6
-3
未找到文件。
apm-sniffer/apm-
sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define
/MultiClassNameMatch.java
→
apm-sniffer/apm-
agent-core/src/main/java/org/apache/skywalking/apm/agent/core/plugin/match
/MultiClassNameMatch.java
浏览文件 @
2713b5fd
...
...
@@ -17,14 +17,12 @@
*/
package
org.apache.skywalking.apm.
plugin.jdbc.mysql.define
;
package
org.apache.skywalking.apm.
agent.core.plugin.match
;
import
java.util.Arrays
;
import
java.util.List
;
import
net.bytebuddy.description.type.TypeDescription
;
import
net.bytebuddy.matcher.ElementMatcher
;
import
org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch
;
import
org.apache.skywalking.apm.agent.core.plugin.match.IndirectMatch
;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
named
;
...
...
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/CallableInstrumentation.java
浏览文件 @
2713b5fd
...
...
@@ -27,7 +27,7 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInst
import
org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch
;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
named
;
import
static
org
.
apache
.
skywalking
.
apm
.
plugin
.
jdbc
.
mysql
.
define
.
MultiClassNameMatch
.
byMultiClassMatch
;
import
static
org
.
apache
.
skywalking
.
apm
.
agent
.
core
.
plugin
.
match
.
MultiClassNameMatch
.
byMultiClassMatch
;
/**
* {@link CallableInstrumentation} define that the mysql-2.x plugin intercepts the following methods in the {@link
...
...
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/DriverInstrumentation.java
浏览文件 @
2713b5fd
...
...
@@ -22,7 +22,7 @@ package org.apache.skywalking.apm.plugin.jdbc.mysql.define;
import
org.apache.skywalking.apm.plugin.jdbc.define.AbstractDriverInstrumentation
;
import
org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch
;
import
static
org
.
apache
.
skywalking
.
apm
.
plugin
.
jdbc
.
mysql
.
define
.
MultiClassNameMatch
.
byMultiClassMatch
;
import
static
org
.
apache
.
skywalking
.
apm
.
agent
.
core
.
plugin
.
match
.
MultiClassNameMatch
.
byMultiClassMatch
;
/**
* {@link DriverInstrumentation} presents that skywalking intercepts {@link com.mysql.jdbc.Driver}.
...
...
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/Mysql5xConnectionInstrumentation.java
浏览文件 @
2713b5fd
...
...
@@ -21,7 +21,7 @@ package org.apache.skywalking.apm.plugin.jdbc.mysql.define;
import
org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch
;
import
static
org
.
apache
.
skywalking
.
apm
.
plugin
.
jdbc
.
mysql
.
define
.
MultiClassNameMatch
.
byMultiClassMatch
;
import
static
org
.
apache
.
skywalking
.
apm
.
agent
.
core
.
plugin
.
match
.
MultiClassNameMatch
.
byMultiClassMatch
;
/**
* {@link Mysql5xConnectionInstrumentation } interceptor {@link com.mysql.cj.jdbc.ConnectionImpl} and
...
...
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/PreparedStatementInstrumentation.java
浏览文件 @
2713b5fd
...
...
@@ -27,7 +27,7 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc
import
org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch
;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
named
;
import
static
org
.
apache
.
skywalking
.
apm
.
plugin
.
jdbc
.
mysql
.
define
.
MultiClassNameMatch
.
byMultiClassMatch
;
import
static
org
.
apache
.
skywalking
.
apm
.
agent
.
core
.
plugin
.
match
.
MultiClassNameMatch
.
byMultiClassMatch
;
/**
* {@link PreparedStatementInstrumentation} define that the mysql-2.x plugin intercepts the following methods in the
...
...
apm-sniffer/apm-sdk-plugin/mysql-5.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/mysql/define/StatementInstrumentation.java
浏览文件 @
2713b5fd
...
...
@@ -27,7 +27,7 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterc
import
org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch
;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
named
;
import
static
org
.
apache
.
skywalking
.
apm
.
plugin
.
jdbc
.
mysql
.
define
.
MultiClassNameMatch
.
byMultiClassMatch
;
import
static
org
.
apache
.
skywalking
.
apm
.
agent
.
core
.
plugin
.
match
.
MultiClassNameMatch
.
byMultiClassMatch
;
/**
* {@link StatementInstrumentation} intercepts the following methods in the {@link
...
...
apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/AbstractJdbc2StatementInstrumentation.java
浏览文件 @
2713b5fd
...
...
@@ -31,6 +31,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
takesArguments
;
import
static
org
.
apache
.
skywalking
.
apm
.
agent
.
core
.
plugin
.
match
.
NameMatch
.
byName
;
import
static
org
.
apache
.
skywalking
.
apm
.
plugin
.
jdbc
.
postgresql
.
Variables
.
PG_PREPARED_STATEMENT_EXECUTE_METHOD_INTERCEPTOR
;
import
static
org
.
apache
.
skywalking
.
apm
.
plugin
.
jdbc
.
postgresql
.
Variables
.
PG_STATEMENT_EXECUTE_METHOD_INTERCEPTOR
;
/**
* {@link AbstractJdbc2StatementInstrumentation} intercept the following methods that the class which extend {@link
...
...
@@ -61,16 +62,27 @@ public class AbstractJdbc2StatementInstrumentation extends ClassInstanceMethodsE
new
InstanceMethodsInterceptPoint
()
{
@Override
public
ElementMatcher
<
MethodDescription
>
getMethodsMatcher
()
{
return
named
(
"execute"
).
and
(
takesArguments
(
0
))
.
or
(
named
(
"execute"
).
and
(
takesArguments
(
1
)))
.
or
(
named
(
"executeBatch"
))
.
or
(
named
(
"executeQuery"
).
and
(
takesArguments
(
0
)))
.
or
(
named
(
"executeUpdate"
).
and
(
takesArguments
(
0
)));
}
@Override
public
String
getMethodsInterceptor
()
{
return
PG_PREPARED_STATEMENT_EXECUTE_METHOD_INTERCEPTOR
;
}
@Override
public
boolean
isOverrideArgs
()
{
return
false
;
}
},
new
InstanceMethodsInterceptPoint
()
{
@Override
public
ElementMatcher
<
MethodDescription
>
getMethodsMatcher
()
{
return
named
(
"execute"
).
and
(
takesArguments
(
1
))
.
or
(
named
(
"executeQuery"
).
and
(
takesArguments
(
1
)))
.
or
(
named
(
"executeUpdate"
).
and
(
takesArguments
(
0
)))
.
or
(
named
(
"executeUpdate"
).
and
(
takesArguments
(
1
)));
}
@Override
public
String
getMethodsInterceptor
()
{
return
PG_
PREPARED_
STATEMENT_EXECUTE_METHOD_INTERCEPTOR
;
return
PG_STATEMENT_EXECUTE_METHOD_INTERCEPTOR
;
}
@Override
public
boolean
isOverrideArgs
()
{
...
...
apm-sniffer/apm-sdk-plugin/postgresql-8.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/jdbc/postgresql/define/ConnectionInstrumentation.java
浏览文件 @
2713b5fd
...
...
@@ -29,7 +29,7 @@ import org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
named
;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
takesArguments
;
import
static
org
.
apache
.
skywalking
.
apm
.
agent
.
core
.
plugin
.
bytebuddy
.
ArgumentTypeNameMatch
.
takesArgumentWithType
;
import
static
org
.
apache
.
skywalking
.
apm
.
agent
.
core
.
plugin
.
match
.
NameMatch
.
byName
;
import
static
org
.
apache
.
skywalking
.
apm
.
agent
.
core
.
plugin
.
match
.
MultiClassNameMatch
.
byMultiClassMatch
;
/**
* {@link ConnectionInstrumentation} intercept the following methods that the class which extend {@link
...
...
@@ -49,8 +49,11 @@ import static org.apache.skywalking.apm.agent.core.plugin.match.NameMatch.byName
public
class
ConnectionInstrumentation
extends
ClassInstanceMethodsEnhancePluginDefine
{
private
static
final
String
PREPARE_STATEMENT_METHOD_WITH_STRING_ARRAY_INTERCEPTOR_CLASS
=
"org.apache.skywalking.apm.plugin.jdbc.postgresql.JDBCPrepareStatementWithStringArrayInterceptor"
;
public
static
final
String
ENHANCE_CLASS
=
"org.postgresql.jdbc.PgConnection"
;
public
static
final
String
PG_CONNECTION_
ENHANCE_CLASS
=
"org.postgresql.jdbc.PgConnection"
;
public
static
final
String
STRING_ARRAY_ARGUMENT_TYPE
=
"java.lang.String[]"
;
public
static
final
String
PG_JDBC42_CONNECTION_ENHANCE_CLASS
=
"org.postgresql.jdbc42.Jdbc42Connection"
;
public
static
final
String
PG_JDBC3_CONNECTION_ENHANCE_CLASS
=
"org.postgresql.jdbc3g.Jdbc3gConnection"
;
public
static
final
String
PG_JDBC4_CONNECTION_ENHANCE_CLASS
=
"org.postgresql.jdbc4.Jdbc4Connection"
;
@Override
protected
ConstructorInterceptPoint
[]
getConstructorsInterceptPoints
()
{
return
new
ConstructorInterceptPoint
[
0
];
...
...
@@ -127,6 +130,6 @@ public class ConnectionInstrumentation extends ClassInstanceMethodsEnhancePlugin
}
@Override
protected
ClassMatch
enhanceClass
()
{
return
by
Name
(
ENHANCE_CLASS
);
return
by
MultiClassMatch
(
PG_CONNECTION_ENHANCE_CLASS
,
PG_JDBC42_CONNECTION_ENHANCE_CLASS
,
PG_JDBC3_CONNECTION_ENHANCE_CLASS
,
PG_JDBC4_CONNECTION_
ENHANCE_CLASS
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录