Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gdyjdao
SkyWalking
提交
979fa733
S
SkyWalking
项目概览
gdyjdao
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / 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,发现更多精彩内容 >>
提交
979fa733
编写于
7月 15, 2019
作者:
L
li.can
提交者:
wu-sheng
7月 15, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add aspectJ path (#3080)
上级
4db1773d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
201 addition
and
40 deletion
+201
-40
apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AopExpressionMatchInterceptor.java
...pm/plugin/spring/patch/AopExpressionMatchInterceptor.java
+8
-40
apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AspectJExpressionPointCutInterceptor.java
...in/spring/patch/AspectJExpressionPointCutInterceptor.java
+54
-0
apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/MatchUtil.java
.../apache/skywalking/apm/plugin/spring/patch/MatchUtil.java
+61
-0
apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AspectJExpressionPointCutInstrumentation.java
...atch/define/AspectJExpressionPointCutInstrumentation.java
+77
-0
apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/resources/skywalking-plugin.def
...ugins/core-patch/src/main/resources/skywalking-plugin.def
+1
-0
未找到文件。
apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AopExpressionMatchInterceptor.java
浏览文件 @
979fa733
...
...
@@ -17,14 +17,12 @@
package
org.apache.skywalking.apm.plugin.spring.patch
;
import
java.lang.reflect.Method
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMethodsAroundInterceptor
;
import
java.lang.reflect.Method
;
/**
* {@link AopExpressionMatchInterceptor} check if the method is match the enhanced method
* if yes,return false else return true;
...
...
@@ -33,24 +31,16 @@ import org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMet
*/
public
class
AopExpressionMatchInterceptor
implements
StaticMethodsAroundInterceptor
{
private
List
<
Method
>
methods
=
new
ArrayList
<
Method
>(
2
);
public
AopExpressionMatchInterceptor
()
{
methods
.
addAll
(
Arrays
.
asList
(
EnhancedInstance
.
class
.
getDeclaredMethods
()));
}
@Override
public
void
beforeMethod
(
Class
clazz
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
parameterTypes
,
MethodInterceptResult
result
)
{
public
void
beforeMethod
(
Class
clazz
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
parameterTypes
,
MethodInterceptResult
result
)
{
}
@Override
public
Object
afterMethod
(
Class
clazz
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
parameterTypes
,
Object
ret
)
{
Method
targetAopMethod
=
(
Method
)
allArguments
[
1
];
Class
<?>
targetAopClass
=
(
Class
<?>)
allArguments
[
2
];
if
(
targetAopClass
!=
null
&&
EnhancedInstance
.
class
.
isAssignableFrom
(
targetAopClass
)
&&
isEnhancedMethod
(
targetAopMethod
))
{
public
Object
afterMethod
(
Class
clazz
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
parameterTypes
,
Object
ret
)
{
Method
targetAopMethod
=
(
Method
)
allArguments
[
1
];
Class
<?>
targetAopClass
=
(
Class
<?>)
allArguments
[
2
];
if
(
targetAopClass
!=
null
&&
EnhancedInstance
.
class
.
isAssignableFrom
(
targetAopClass
)
&&
MatchUtil
.
isEnhancedMethod
(
targetAopMethod
))
{
return
false
;
}
return
ret
;
...
...
@@ -58,30 +48,8 @@ public class AopExpressionMatchInterceptor implements StaticMethodsAroundInterce
@Override
public
void
handleMethodException
(
Class
clazz
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
parameterTypes
,
Throwable
t
)
{
Throwable
t
)
{
}
private
boolean
isEnhancedMethod
(
Method
targetMethod
)
{
for
(
Method
method
:
methods
)
{
if
(
method
.
getName
().
equals
(
targetMethod
.
getName
())
&&
method
.
getReturnType
().
equals
(
targetMethod
.
getReturnType
())
&&
equalParamTypes
(
method
.
getParameterTypes
(),
targetMethod
.
getParameterTypes
()))
{
return
true
;
}
}
return
false
;
}
private
boolean
equalParamTypes
(
Class
<?>[]
params1
,
Class
<?>[]
params2
)
{
if
(
params1
.
length
!=
params2
.
length
)
{
return
false
;
}
for
(
int
i
=
0
;
i
<
params1
.
length
;
i
++)
{
if
(!
params1
[
i
].
equals
(
params2
[
i
]))
{
return
false
;
}
}
return
true
;
}
}
apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/AspectJExpressionPointCutInterceptor.java
0 → 100644
浏览文件 @
979fa733
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You 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.
*/
package
org.apache.skywalking.apm.plugin.spring.patch
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceMethodsAroundInterceptor
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.MethodInterceptResult
;
import
java.lang.reflect.Method
;
/**
* {@link AspectJExpressionPointCutInterceptor} check if the method is match the enhanced method
* if yes,return false else return true;
*
* @author lican
*/
public
class
AspectJExpressionPointCutInterceptor
implements
InstanceMethodsAroundInterceptor
{
@Override
public
void
beforeMethod
(
EnhancedInstance
objInst
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
argumentsTypes
,
MethodInterceptResult
result
)
throws
Throwable
{
}
@Override
public
Object
afterMethod
(
EnhancedInstance
objInst
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
argumentsTypes
,
Object
ret
)
throws
Throwable
{
Method
targetAopMethod
=
(
Method
)
allArguments
[
0
];
Class
<?>
targetAopClass
=
(
Class
<?>)
allArguments
[
1
];
if
(
targetAopClass
!=
null
&&
EnhancedInstance
.
class
.
isAssignableFrom
(
targetAopClass
)
&&
MatchUtil
.
isEnhancedMethod
(
targetAopMethod
))
{
return
false
;
}
return
ret
;
}
@Override
public
void
handleMethodException
(
EnhancedInstance
objInst
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
argumentsTypes
,
Throwable
t
)
{
}
}
\ No newline at end of file
apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/MatchUtil.java
0 → 100644
浏览文件 @
979fa733
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You 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.
*/
package
org.apache.skywalking.apm.plugin.spring.patch
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance
;
import
java.lang.reflect.Method
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.List
;
/**
* @author lican
*/
public
class
MatchUtil
{
private
static
List
<
Method
>
METHODS
=
new
ArrayList
<
Method
>(
2
);
static
{
METHODS
.
addAll
(
Arrays
.
asList
(
EnhancedInstance
.
class
.
getDeclaredMethods
()));
}
static
boolean
isEnhancedMethod
(
Method
targetMethod
)
{
for
(
Method
method
:
METHODS
)
{
if
(
method
.
getName
().
equals
(
targetMethod
.
getName
())
&&
method
.
getReturnType
().
equals
(
targetMethod
.
getReturnType
())
&&
equalParamTypes
(
method
.
getParameterTypes
(),
targetMethod
.
getParameterTypes
()))
{
return
true
;
}
}
return
false
;
}
private
static
boolean
equalParamTypes
(
Class
<?>[]
params1
,
Class
<?>[]
params2
)
{
if
(
params1
.
length
!=
params2
.
length
)
{
return
false
;
}
for
(
int
i
=
0
;
i
<
params1
.
length
;
i
++)
{
if
(!
params1
[
i
].
equals
(
params2
[
i
]))
{
return
false
;
}
}
return
true
;
}
}
apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AspectJExpressionPointCutInstrumentation.java
0 → 100644
浏览文件 @
979fa733
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You 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.
*/
package
org.apache.skywalking.apm.plugin.spring.patch.define
;
import
net.bytebuddy.description.method.MethodDescription
;
import
net.bytebuddy.matcher.ElementMatcher
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.DeclaredInstanceMethodsInterceptPoint
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.InstanceMethodsInterceptPoint
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine
;
import
org.apache.skywalking.apm.agent.core.plugin.match.ClassMatch
;
import
org.apache.skywalking.apm.agent.core.plugin.match.NameMatch
;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
named
;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
takesArguments
;
/**
* {@link AspectJExpressionPointCutInstrumentation} indicates that exclude enhanced method in @{link EnhancedInstance} to prevent
* side effect when use pointcut way to intercept your code
*
* @author lican
*/
public
class
AspectJExpressionPointCutInstrumentation
extends
ClassInstanceMethodsEnhancePluginDefine
{
private
static
final
String
ENHANCE_CLASS
=
"org.springframework.aop.aspectj.AspectJExpressionPointcut"
;
private
static
final
String
ENHANCE_METHOD
=
"matches"
;
private
static
final
String
INTERCEPT_CLASS
=
"org.apache.skywalking.apm.plugin.spring.patch.AspectJExpressionPointCutInterceptor"
;
@Override
protected
ConstructorInterceptPoint
[]
getConstructorsInterceptPoints
()
{
return
new
ConstructorInterceptPoint
[
0
];
}
@Override
protected
InstanceMethodsInterceptPoint
[]
getInstanceMethodsInterceptPoints
()
{
return
new
DeclaredInstanceMethodsInterceptPoint
[]{
new
DeclaredInstanceMethodsInterceptPoint
()
{
@Override
public
ElementMatcher
<
MethodDescription
>
getMethodsMatcher
()
{
return
named
(
ENHANCE_METHOD
).
and
(
takesArguments
(
3
));
}
@Override
public
String
getMethodsInterceptor
()
{
return
INTERCEPT_CLASS
;
}
@Override
public
boolean
isOverrideArgs
()
{
return
false
;
}
}
};
}
@Override
protected
ClassMatch
enhanceClass
()
{
return
NameMatch
.
byName
(
ENHANCE_CLASS
);
}
}
apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/resources/skywalking-plugin.def
浏览文件 @
979fa733
...
...
@@ -17,4 +17,5 @@
spring-core-patch=org.apache.skywalking.apm.plugin.spring.patch.define.AopProxyFactoryInstrumentation
spring-core-patch=org.apache.skywalking.apm.plugin.spring.patch.define.AutowiredAnnotationProcessorInstrumentation
spring-core-patch=org.apache.skywalking.apm.plugin.spring.patch.define.AopExpressionMatchInstrumentation
spring-core-patch=org.apache.skywalking.apm.plugin.spring.patch.define.AspectJExpressionPointCutInstrumentation
spring-core-patch=org.apache.skywalking.apm.plugin.spring.patch.define.BeanWrapperImplInstrumentation
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录