Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
润土的好友猹
SkyWalking
提交
54c1cd5c
S
SkyWalking
项目概览
润土的好友猹
/
SkyWalking
与 Fork 源项目一致
Fork自
apache / SkyWalking
通知
9
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,发现更多精彩内容 >>
提交
54c1cd5c
编写于
2月 17, 2020
作者:
L
lsyf
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix ehcache: missing interceptor of private constructor called by clone method
上级
ca6a5618
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
86 addition
and
1 deletion
+86
-1
apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheCloneInterceptor.java
...alking/apm/plugin/ehcache/v2/EhcacheCloneInterceptor.java
+52
-0
apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/define/EhcachePluginInstrumentation.java
...lugin/ehcache/v2/define/EhcachePluginInstrumentation.java
+20
-1
apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheInterceptorTest.java
...walking/apm/plugin/ehcache/v2/EhcacheInterceptorTest.java
+14
-0
未找到文件。
apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheCloneInterceptor.java
0 → 100644
浏览文件 @
54c1cd5c
/*
* 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.ehcache.v2
;
import
net.sf.ehcache.Cache
;
import
net.sf.ehcache.config.CacheConfiguration
;
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
;
public
class
EhcacheCloneInterceptor
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
{
if
(
ret
==
null
)
{
return
null
;
}
CacheConfiguration
cacheConfiguration
=
((
Cache
)
ret
).
getCacheConfiguration
();
if
(
cacheConfiguration
!=
null
)
{
((
EnhancedInstance
)
ret
).
setSkyWalkingDynamicField
(
new
EhcacheEnhanceInfo
(
cacheConfiguration
.
getName
()));
}
return
ret
;
}
@Override
public
void
handleMethodException
(
EnhancedInstance
objInst
,
Method
method
,
Object
[]
allArguments
,
Class
<?>[]
argumentsTypes
,
Throwable
t
)
{
}
}
apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/ehcache/v2/define/EhcachePluginInstrumentation.java
浏览文件 @
54c1cd5c
...
...
@@ -37,10 +37,12 @@ public class EhcachePluginInstrumentation extends ClassInstanceMethodsEnhancePlu
public
static
final
String
INTERCEPT_CLASS
=
"net.sf.ehcache.Cache"
;
public
static
final
String
CONSTRUCTOR_CLASS_INTERCEPT_CLASS
=
"org.apache.skywalking.apm.plugin.ehcache.v2.EhcacheConstructorInterceptor"
;
public
static
final
String
CLONE_CLASS_INTERCEPT_CLASS
=
"org.apache.skywalking.apm.plugin.ehcache.v2.EhcacheCloneInterceptor"
;
// get and put value
public
static
final
String
PUT_CACHE_ENHANCE_METHOD
=
"put"
;
public
static
final
String
GET_CACHE_ENHANCE_METHOD
=
"get"
;
public
static
final
String
CLONE_CACHE_ENHANCE_METHOD
=
"clone"
;
public
static
final
String
GET_QUIET_CACHE_ENHANCE_METHOD
=
"getQuiet"
;
public
static
final
String
REMOVE_CACHE_ENHANCE_METHOD
=
"remove"
;
public
static
final
String
REMOVE_AND_RETURN_ELEMENT_CACHE_ENHANCE_METHOD
=
"removeAndReturnElement"
;
...
...
@@ -89,7 +91,24 @@ public class EhcachePluginInstrumentation extends ClassInstanceMethodsEnhancePlu
@Override
public
InstanceMethodsInterceptPoint
[]
getInstanceMethodsInterceptPoints
()
{
return
new
InstanceMethodsInterceptPoint
[]
{
new
InstanceMethodsInterceptPoint
()
{
new
InstanceMethodsInterceptPoint
()
{
@Override
public
ElementMatcher
<
MethodDescription
>
getMethodsMatcher
()
{
return
named
(
CLONE_CACHE_ENHANCE_METHOD
);
}
@Override
public
String
getMethodsInterceptor
()
{
return
CLONE_CLASS_INTERCEPT_CLASS
;
}
@Override
public
boolean
isOverrideArgs
()
{
return
false
;
}
},
new
InstanceMethodsInterceptPoint
()
{
@Override
public
ElementMatcher
<
MethodDescription
>
getMethodsMatcher
()
{
return
named
(
GET_WITH_LOADER_CACHE_ENHANCE_METHOD
).
or
(
named
(
GET_CACHE_ENHANCE_METHOD
).
and
(
takesArgument
(
0
,
Object
.
class
)))
...
...
apm-sniffer/apm-sdk-plugin/ehcache-2.x-plugin/src/test/java/org/apache/skywalking/apm/plugin/ehcache/v2/EhcacheInterceptorTest.java
浏览文件 @
54c1cd5c
...
...
@@ -38,6 +38,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
import
org.powermock.modules.junit4.PowerMockRunnerDelegate
;
import
org.powermock.reflect.Whitebox
;
import
static
org
.
apache
.
skywalking
.
apm
.
plugin
.
ehcache
.
v2
.
define
.
EhcachePluginInstrumentation
.
CLONE_CACHE_ENHANCE_METHOD
;
import
static
org
.
apache
.
skywalking
.
apm
.
plugin
.
ehcache
.
v2
.
define
.
EhcachePluginInstrumentation
.
GET_ALL_CACHE_ENHANCE_METHOD
;
import
static
org
.
apache
.
skywalking
.
apm
.
plugin
.
ehcache
.
v2
.
define
.
EhcachePluginInstrumentation
.
GET_CACHE_ENHANCE_METHOD
;
import
static
org
.
apache
.
skywalking
.
apm
.
plugin
.
ehcache
.
v2
.
define
.
EhcachePluginInstrumentation
.
PUT_CACHE_ENHANCE_METHOD
;
...
...
@@ -64,6 +65,7 @@ public class EhcacheInterceptorTest {
private
EhcacheOperateAllInterceptor
operateAllInterceptor
;
private
EhcacheLockInterceptor
lockInterceptor
;
private
EhcacheConstructorInterceptor
constructorInterceptor
;
private
EhcacheCloneInterceptor
cloneInterceptor
;
private
Object
[]
operateObjectArguments
;
private
Object
[]
operateElementArguments
;
private
Object
[]
tryLockArguments
;
...
...
@@ -80,6 +82,8 @@ public class EhcacheInterceptorTest {
private
Method
releaseReadLockMethod
;
private
Method
releaseWriteLockMethod
;
private
Method
cloneMethod
;
private
EnhancedInstance
enhancedInstance
=
new
EnhancedInstance
()
{
@Override
public
Object
getSkyWalkingDynamicField
()
{
...
...
@@ -97,6 +101,7 @@ public class EhcacheInterceptorTest {
operateElementInterceptor
=
new
EhcacheOperateElementInterceptor
();
operateAllInterceptor
=
new
EhcacheOperateAllInterceptor
();
constructorInterceptor
=
new
EhcacheConstructorInterceptor
();
cloneInterceptor
=
new
EhcacheCloneInterceptor
();
lockInterceptor
=
new
EhcacheLockInterceptor
();
exception
=
new
Exception
();
...
...
@@ -117,6 +122,8 @@ public class EhcacheInterceptorTest {
tryWriteLockMethod
=
Whitebox
.
getMethods
(
Cache
.
class
,
WRITE_LOCK_TRY_ENHANCE_METHOD
)[
0
];
releaseReadLockMethod
=
Whitebox
.
getMethods
(
Cache
.
class
,
READ_LOCK_RELEASE_ENHANCE_METHOD
)[
0
];
releaseWriteLockMethod
=
Whitebox
.
getMethods
(
Cache
.
class
,
WRITE_LOCK_RELEASE_ENHANCE_METHOD
)[
0
];
cloneMethod
=
Whitebox
.
getMethods
(
Cache
.
class
,
CLONE_CACHE_ENHANCE_METHOD
)[
0
];
}
@Test
...
...
@@ -124,6 +131,13 @@ public class EhcacheInterceptorTest {
constructorInterceptor
.
onConstruct
(
enhancedInstance
,
new
Object
[]
{
new
CacheConfiguration
(
CACHE_NAME
,
20
)});
}
@Test
public
void
assertClone
()
throws
Throwable
{
cloneInterceptor
.
beforeMethod
(
enhancedInstance
,
cloneMethod
,
null
,
null
,
null
);
cloneInterceptor
.
handleMethodException
(
enhancedInstance
,
cloneMethod
,
null
,
null
,
exception
);
cloneInterceptor
.
afterMethod
(
enhancedInstance
,
cloneMethod
,
null
,
null
,
null
);
}
@Test
public
void
assertPutSuccess
()
throws
Throwable
{
// put arguments
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录