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

Combine context trace project and context trace project

This commit is contained in:
ascrutae 2017-09-04 16:08:58 +08:00
parent 30a25c8aad
commit dd8e066249
11 changed files with 7 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
apm-application-toolkit/apm-toolkit-trace-context/pom.xml
View File

@ -1,45 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm-application-toolkit</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-toolkit-trace-context</artifactId>
<packaging>jar</packaging>
<url>http://maven.apache.org</url>
<build>
<plugins>
<plugin>
<!-- 源码插件 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<!-- 发布时自动将源码同时发布的配置 -->
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<version>2.4</version>
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>bintray-wu-sheng-sky-walking-repository</id>
<name>wu-sheng-sky-walking-repository</name>
<url>
https://api.bintray.com/maven/wu-sheng/skywalking/org.skywalking.apm-toolkit-trace-context/;publish=1
</url>
</repository>
</distributionManagement>
</project>

0
apm-application-toolkit/apm-toolkit-trace-context/src/main/java/org/skywalking/apm/toolkit/trace/TraceContext.java → apm-application-toolkit/apm-toolkit-trace/src/main/java/org/skywalking/apm/toolkit/trace/TraceContext.java
View File

1
apm-application-toolkit/pom.xml
View File

@ -17,7 +17,6 @@
<module>apm-toolkit-log4j-1.x</module>
<module>apm-toolkit-log4j-2.x</module>
<module>apm-toolkit-logback-1.x</module>
<module>apm-toolkit-trace-context</module>
<module>apm-toolkit-opentracing</module>
<module>apm-toolkit-trace</module>
</modules>

6
apm-sniffer/apm-agent/pom.xml
View File

@ -119,12 +119,6 @@
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.skywalking</groupId>
<artifactId>apm-toolkit-trace-context-activation</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.skywalking</groupId>
<artifactId>apm-toolkit-opentracing-activation</artifactId>

8
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/ActiveSpanTagInterceptor.java
View File

@ -9,8 +9,12 @@ import org.skywalking.apm.agent.core.plugin.interceptor.enhance.StaticMethodsAro
public class ActiveSpanTagInterceptor implements StaticMethodsAroundInterceptor {
@Override public void beforeMethod(Class clazz, Method method, Object[] allArguments, Class<?>[] parameterTypes,
MethodInterceptResult result) {
AbstractSpan activeSpan = ContextManager.activeSpan();
activeSpan.tag(String.valueOf(allArguments[0]), String.valueOf(allArguments[1]));
AbstractSpan activeSpan = null;
try {
activeSpan = ContextManager.activeSpan();
activeSpan.tag(String.valueOf(allArguments[0]), String.valueOf(allArguments[1]));
} catch (NullPointerException e) {
}
}
@Override public Object afterMethod(Class clazz, Method method, Object[] allArguments, Class<?>[] parameterTypes,

0
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java → apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextActivation.java
View File

0
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java → apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/java/org/skywalking/apm/toolkit/activation/trace/TraceContextInterceptor.java
View File

1
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-activation/src/main/resources/skywalking-plugin.def
View File

@ -1,2 +1,3 @@
trace-annotation=org.skywalking.apm.toolkit.activation.trace.ActiveSpanTagActivation
trace-annotation=org.skywalking.apm.toolkit.activation.trace.TraceAnnotationActivation
trace-context=org.skywalking.apm.toolkit.activation.trace.TraceContextActivation

15
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/pom.xml
View File

@ -1,15 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>apm-toolkit-activation</artifactId>
<groupId>org.skywalking</groupId>
<version>3.2-2017</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>apm-toolkit-trace-context-activation</artifactId>
<packaging>jar</packaging>
<name>apm-toolkit-trace-context-activation</name>
</project>

1
apm-sniffer/apm-toolkit-activation/apm-toolkit-trace-context-activation/src/main/resources/skywalking-plugin.def
View File

@ -1 +0,0 @@
tracecontext=org.skywalking.apm.toolkit.activation.trace.TraceContextActivation

1
apm-sniffer/apm-toolkit-activation/pom.xml
View File

@ -13,7 +13,6 @@
<module>apm-toolkit-log4j-1.x-activation</module>
<module>apm-toolkit-log4j-2.x-activation</module>
<module>apm-toolkit-logback-1.x-activation</module>
<module>apm-toolkit-trace-context-activation</module>
<module>apm-toolkit-opentracing-activation</module>
<module>apm-toolkit-trace-activation</module>
</modules>