kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/trace-context

This commit is contained in:
Xin,Zhang 2017-12-14 10:03:43 +08:00 committed by GitHub
parent b85ada779c 419acc16bd
commit 7dd91fff96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apm-sniffer/apm-agent-core/pom.xml
View File

@ -50,6 +50,10 @@
<shade.io.netty.target>${shade.package}.${shade.io.netty.source}</shade.io.netty.target>
<shade.io.opencensus.source>io.opencensus</shade.io.opencensus.source>
<shade.io.opencensus.target>${shade.package}.${shade.io.opencensus.source}</shade.io.opencensus.target>
<shade.org.apache.http.source>org.apache.http</shade.org.apache.http.source>
<shade.org.apache.http.target>${shade.package}.${shade.org.apache.http.source}</shade.org.apache.http.target>
<shade.org.apache.commons.source>org.apache.commons</shade.org.apache.commons.source>
<shade.org.apache.commons.target>${shade.package}.${shade.org.apache.http.source}</shade.org.apache.commons.target>
</properties>
<dependencies>
@ -176,6 +180,14 @@
<pattern>${shade.io.opencensus.source}</pattern>
<shadedPattern>${shade.io.opencensus.target}</shadedPattern>
</relocation>
<relocation>
<pattern>${shade.org.apache.http.source}</pattern>
<shadedPattern>${shade.org.apache.http.target}</shadedPattern>
</relocation>
<relocation>
<pattern>${shade.org.apache.commons.source}</pattern>
<shadedPattern>${shade.org.apache.commons.target}</shadedPattern>
</relocation>
</relocations>
<filters>
<filter>

2
apm-sniffer/apm-sdk-plugin/spring-plugins/core-patch/src/main/java/org/apache/skywalking/apm/plugin/spring/patch/define/AutowiredAnnotationProcessorInstrumentation.java
View File

@ -40,7 +40,7 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
public class AutowiredAnnotationProcessorInstrumentation extends ClassInstanceMethodsEnhancePluginDefine {
private static final String ENHANCE_CLASS = "org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor";
private static final String ENHANCE_METHOD = "determineCandidateConstructors";
private static final String INTERCEPTOR_CLASS = "AutowiredAnnotationProcessorInterceptor";
private static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.plugin.spring.patch.AutowiredAnnotationProcessorInterceptor";
@Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
return new ConstructorInterceptPoint[] {

4
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/ActiveSpanTagActivation.java
View File

@ -37,8 +37,8 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
*/
public class ActiveSpanTagActivation extends ClassStaticMethodsEnhancePluginDefine {
public static final String ENHANCE_CLASS = "ActiveSpan";
public static final String INTERCEPTOR_CLASS = "ActiveSpanTagInterceptor";
public static final String ENHANCE_CLASS = "org.apache.skywalking.apm.toolkit.trace.ActiveSpan";
public static final String INTERCEPTOR_CLASS = "org.apache.skywalking.apm.toolkit.activation.trace.ActiveSpanTagInterceptor";
public static final String INTERCEPTOR_METHOD_NAME = "tag";
@Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {

4
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/apache/skywalking/apm/toolkit/activation/trace/TraceAnnotationActivation.java
View File

@ -38,8 +38,8 @@ import static net.bytebuddy.matcher.ElementMatchers.named;
*/
public class TraceAnnotationActivation extends ClassInstanceMethodsEnhancePluginDefine {
public static final String TRACE_ANNOTATION_METHOD_INTERCEPTOR = "TraceAnnotationMethodInterceptor";
public static final String TRACE_ANNOTATION = "Trace";
public static final String TRACE_ANNOTATION_METHOD_INTERCEPTOR = "org.apache.skywalking.apm.toolkit.activation.trace.TraceAnnotationMethodInterceptor";
public static final String TRACE_ANNOTATION = "org.apache.skywalking.apm.toolkit.trace.Trace";
@Override protected ConstructorInterceptPoint[] getConstructorsInterceptPoints() {
return new ConstructorInterceptPoint[0];