Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
润土的好友猹
SkyWalking
提交
c5b03ba7
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,发现更多精彩内容 >>
提交
c5b03ba7
编写于
9月 16, 2019
作者:
S
SummerOfServenteen
提交者:
wu-sheng
9月 16, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix noSuchMethod (#3408)
上级
876b60c1
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
168 addition
and
3 deletion
+168
-3
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/ControllerForLowVersionConstructorInterceptor.java
...mvc/v4/ControllerForLowVersionConstructorInterceptor.java
+41
-0
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractSpring4Instrumentation.java
.../spring/mvc/v4/define/AbstractSpring4Instrumentation.java
+1
-1
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerForLowVersionInstrumentation.java
...mvc/v4/define/ControllerForLowVersionInstrumentation.java
+57
-0
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerForLowVersionInstrumentation.java
...v4/define/RestControllerForLowVersionInstrumentation.java
+57
-0
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerInstrumentation.java
...n/spring/mvc/v4/define/RestControllerInstrumentation.java
+10
-2
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/resources/skywalking-plugin.def
...ation-4.x-plugin/src/main/resources/skywalking-plugin.def
+2
-0
未找到文件。
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/ControllerForLowVersionConstructorInterceptor.java
0 → 100644
浏览文件 @
c5b03ba7
/*
* 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.mvc.v4
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.EnhancedInstance
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.enhance.InstanceConstructorInterceptor
;
import
org.apache.skywalking.apm.plugin.spring.mvc.commons.EnhanceRequireObjectCache
;
import
org.apache.skywalking.apm.plugin.spring.mvc.commons.PathMappingCache
;
import
org.springframework.web.bind.annotation.RequestMapping
;
public
class
ControllerForLowVersionConstructorInterceptor
implements
InstanceConstructorInterceptor
{
@Override
public
void
onConstruct
(
EnhancedInstance
objInst
,
Object
[]
allArguments
)
{
String
basePath
=
""
;
RequestMapping
basePathRequestMapping
=
objInst
.
getClass
().
getAnnotation
(
RequestMapping
.
class
);
if
(
basePathRequestMapping
!=
null
)
{
if
(
basePathRequestMapping
.
value
().
length
>
0
)
{
basePath
=
basePathRequestMapping
.
value
()[
0
];
}
}
EnhanceRequireObjectCache
enhanceRequireObjectCache
=
new
EnhanceRequireObjectCache
();
enhanceRequireObjectCache
.
setPathMappingCache
(
new
PathMappingCache
(
basePath
));
objInst
.
setSkyWalkingDynamicField
(
enhanceRequireObjectCache
);
}
}
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/AbstractSpring4Instrumentation.java
浏览文件 @
c5b03ba7
...
...
@@ -25,7 +25,7 @@ public abstract class AbstractSpring4Instrumentation extends ClassInstanceMethod
public
static
final
String
WITHNESS_CLASSES
=
"org.springframework.cache.interceptor.SimpleKey"
;
@Override
protected
final
String
[]
witnessClasses
()
{
protected
String
[]
witnessClasses
()
{
return
new
String
[]
{
WITHNESS_CLASSES
,
"org.springframework.cache.interceptor.DefaultKeyGenerator"
};
}
}
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/ControllerForLowVersionInstrumentation.java
0 → 100644
浏览文件 @
c5b03ba7
/*
* 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.mvc.v4.define
;
import
net.bytebuddy.description.method.MethodDescription
;
import
net.bytebuddy.matcher.ElementMatcher
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint
;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
any
;
public
class
ControllerForLowVersionInstrumentation
extends
AbstractControllerInstrumentation
{
public
static
final
String
WITNESS_CLASSES_LOW_VERSION
=
"org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"
;
public
static
final
String
ENHANCE_ANNOTATION
=
"org.springframework.stereotype.Controller"
;
@Override
public
ConstructorInterceptPoint
[]
getConstructorsInterceptPoints
()
{
ConstructorInterceptPoint
constructorInterceptPoint
=
new
ConstructorInterceptPoint
()
{
@Override
public
ElementMatcher
<
MethodDescription
>
getConstructorMatcher
()
{
return
any
();
}
@Override
public
String
getConstructorInterceptor
()
{
return
"org.apache.skywalking.apm.plugin.spring.mvc.v4.ControllerForLowVersionConstructorInterceptor"
;
}
};
return
new
ConstructorInterceptPoint
[]{
constructorInterceptPoint
};
}
@Override
protected
String
[]
witnessClasses
()
{
return
new
String
[]{
WITHNESS_CLASSES
,
"org.springframework.cache.interceptor.DefaultKeyGenerator"
,
WITNESS_CLASSES_LOW_VERSION
};
}
@Override
protected
String
[]
getEnhanceAnnotations
()
{
return
new
String
[]{
ENHANCE_ANNOTATION
};
}
}
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerForLowVersionInstrumentation.java
0 → 100644
浏览文件 @
c5b03ba7
/*
* 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.mvc.v4.define
;
import
net.bytebuddy.description.method.MethodDescription
;
import
net.bytebuddy.matcher.ElementMatcher
;
import
org.apache.skywalking.apm.agent.core.plugin.interceptor.ConstructorInterceptPoint
;
import
static
net
.
bytebuddy
.
matcher
.
ElementMatchers
.
any
;
public
class
RestControllerForLowVersionInstrumentation
extends
AbstractControllerInstrumentation
{
public
static
final
String
WITNESS_CLASSES_LOW_VERSION
=
"org.springframework.web.context.support.ServletContextPropertyPlaceholderConfigurer"
;
public
static
final
String
ENHANCE_ANNOTATION
=
"org.springframework.web.bind.annotation.RestController"
;
@Override
public
ConstructorInterceptPoint
[]
getConstructorsInterceptPoints
()
{
ConstructorInterceptPoint
constructorInterceptPoint
=
new
ConstructorInterceptPoint
()
{
@Override
public
ElementMatcher
<
MethodDescription
>
getConstructorMatcher
()
{
return
any
();
}
@Override
public
String
getConstructorInterceptor
()
{
return
"org.apache.skywalking.apm.plugin.spring.mvc.v4.ControllerForLowVersionConstructorInterceptor"
;
}
};
return
new
ConstructorInterceptPoint
[]{
constructorInterceptPoint
};
}
@Override
protected
String
[]
witnessClasses
()
{
return
new
String
[]{
WITHNESS_CLASSES
,
"org.springframework.cache.interceptor.DefaultKeyGenerator"
,
WITNESS_CLASSES_LOW_VERSION
};
}
@Override
protected
String
[]
getEnhanceAnnotations
()
{
return
new
String
[]{
ENHANCE_ANNOTATION
};
}
}
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/java/org/apache/skywalking/apm/plugin/spring/mvc/v4/define/RestControllerInstrumentation.java
浏览文件 @
c5b03ba7
...
...
@@ -21,9 +21,17 @@ package org.apache.skywalking.apm.plugin.spring.mvc.v4.define;
public
class
RestControllerInstrumentation
extends
AbstractControllerInstrumentation
{
public
static
final
String
WITNESS_CLASSES_HIGH_VERSION
=
"org.springframework.http.HttpRange"
;
public
static
final
String
ENHANCE_ANNOTATION
=
"org.springframework.web.bind.annotation.RestController"
;
@Override
protected
String
[]
getEnhanceAnnotations
()
{
return
new
String
[]
{
ENHANCE_ANNOTATION
};
@Override
protected
String
[]
getEnhanceAnnotations
()
{
return
new
String
[]{
ENHANCE_ANNOTATION
};
}
@Override
protected
String
[]
witnessClasses
()
{
return
new
String
[]{
WITHNESS_CLASSES
,
"org.springframework.cache.interceptor.DefaultKeyGenerator"
,
WITNESS_CLASSES_HIGH_VERSION
};
}
}
apm-sniffer/apm-sdk-plugin/spring-plugins/mvc-annotation-4.x-plugin/src/main/resources/skywalking-plugin.def
浏览文件 @
c5b03ba7
...
...
@@ -18,3 +18,5 @@ spring-mvc-annotation-4.x=org.apache.skywalking.apm.plugin.spring.mvc.v4.define.
spring-mvc-annotation-4.x=org.apache.skywalking.apm.plugin.spring.mvc.v4.define.RestControllerInstrumentation
spring-mvc-annotation-4.x=org.apache.skywalking.apm.plugin.spring.mvc.v4.define.HandlerMethodInstrumentation
spring-mvc-annotation-4.x=org.apache.skywalking.apm.plugin.spring.mvc.v4.define.InvocableHandlerInstrumentation
spring-mvc-annotation-4.x=org.apache.skywalking.apm.plugin.spring.mvc.v4.define.ControllerForLowVersionInstrumentation
spring-mvc-annotation-4.x=org.apache.skywalking.apm.plugin.spring.mvc.v4.define.RestControllerForLowVersionInstrumentation
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录