Commit 9b47b0c3 authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Merge pull request #105 from ascrutae/feature/3.0 

fix tomcat cannot works issue
parents 533be469 3bbf370d

skywalking-sniffer/skywalking-agent/pom.xml

+22 −4
Original line number Diff line number Diff line
@@ -26,8 +26,14 @@ 
        <shade.akka.target>${shade.package}.${shade.akka.source}</shade.akka.target>

        <shade.scala.source>scala</shade.scala.source>

        <shade.scala.target>${shade.package}.${shade.scala.source}</shade.scala.target>

        <shade.all.org.source>org</shade.all.org.source>

        <shade.all.org.target>${shade.package}.${shade.all.org.source}</shade.all.org.target>

        <shade.org.agrona.source>org.agrona</shade.org.agrona.source>

        <shade.org.agrona.target>${shade.package}.${shade.org.agrona.source}</shade.org.agrona.target>

        <shade.org.jboss.netty.source>org.jboss.netty</shade.org.jboss.netty.source>

        <shade.org.jboss.netty.target>${shade.package}.${shade.org.jboss.netty.source}</shade.org.jboss.netty.target>

        <shade.org.reactivestreams.source>org.reactivestreams</shade.org.reactivestreams.source>

        <shade.org.reactivestreams.target>${shade.package}.${shade.org.reactivestreams.source}</shade.org.reactivestreams.target>

        <shade.org.uncommons.maths.source>org.uncommons.maths</shade.org.uncommons.maths.source>

        <shade.org.uncommons.maths.target>${shade.package}.${shade.org.uncommons.maths.source}</shade.org.uncommons.maths.target>

        <shade.com.google.source>com.google</shade.com.google.source>

        <shade.com.google.target>${shade.package}.${shade.com.google.source}</shade.com.google.target>

        <shade.io.aeron.source>io.aeron</shade.io.aeron.source>
@@ -147,8 +153,20 @@ 
                                    <shadedPattern>${shade.com.google.target}</shadedPattern>

                                </relocation>

                                <relocation>

                                    <pattern>${shade.all.org.source}</pattern>

                                    <shadedPattern>${shade.all.org.target}</shadedPattern>

                                    <pattern>${shade.org.agrona.source}</pattern>

                                    <shadedPattern>${shade.org.agrona.target}</shadedPattern>

                                </relocation>

                                <relocation>

                                    <pattern>${shade.org.jboss.netty.source}</pattern>

                                    <shadedPattern>${shade.org.jboss.netty.target}</shadedPattern>

                                </relocation>

                                <relocation>

                                    <pattern>${shade.org.reactivestreams.source}</pattern>

                                    <shadedPattern>${shade.org.reactivestreams.target}</shadedPattern>

                                </relocation>

                                <relocation>

                                    <pattern>${shade.org.uncommons.maths.source}</pattern>

                                    <shadedPattern>${shade.org.uncommons.maths.target}</shadedPattern>

                                </relocation>

                                <relocation>

                                    <pattern>${shade.scala.source}</pattern>

skywalking-sniffer/skywalking-sdk-plugin/dubbo-plugin/src/main/java/com/a/eye/skywalking/plugin/dubbo/DubboInterceptor.java

+2 −2
Original line number Diff line number Diff line
@@ -55,10 +55,10 @@ public class DubboInterceptor implements InstanceMethodsAroundInterceptor { 
        Tags.URL.set(span, generateRequestURL(requestURL, invocation));

        Tags.COMPONENT.set(span, DUBBO_COMPONENT);

        Tags.SPAN_LAYER.asRPCFramework(span);



        if (isConsumer) {

        Tags.PEER_HOST.set(span, requestURL.getHost());

        Tags.PEER_PORT.set(span, requestURL.getPort());



        if (isConsumer) {

            Tags.SPAN_KIND.set(span, Tags.SPAN_KIND_CLIENT);

            ContextCarrier contextCarrier = new ContextCarrier();

            ContextManager.inject(contextCarrier);

skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/CallableStatementTracing.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ public class CallableStatementTracing { 
                                ConnectionInfo connectInfo, String method, String sql, Executable<R> exec)

            throws SQLException {

        try {

            Span span = ContextManager.createSpan("JDBC/CallableStatement/" + method);

            Span span = ContextManager.createSpan(connectInfo.getDBType() + "/JDBI/CallableStatement/" + method);

            Tags.DB_TYPE.set(span, "sql");

            Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());

            Tags.DB_STATEMENT.set(span, sql);

skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/ConnectionTracing.java

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ public class ConnectionTracing { 
                                ConnectionInfo connectInfo, String method, String sql, Executable<R> exec)

            throws SQLException {

        try {

            Span span = ContextManager.createSpan("JDBC/Connection/" + method);

            Span span = ContextManager.createSpan(connectInfo.getDBType() + "/JDBI/Connection/" + method);

            Tags.DB_TYPE.set(span, "sql");

            Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());

            Tags.DB_STATEMENT.set(span, sql);

skywalking-sniffer/skywalking-sdk-plugin/jdbc-plugin/src/main/java/com/a/eye/skywalking/plugin/jdbc/PreparedStatementTracing.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ public class PreparedStatementTracing { 
                                ConnectionInfo connectInfo, String method, String sql, Executable<R> exec)

            throws SQLException {

        try {

            Span span = ContextManager.createSpan("JDBC/PreparedStatement/" + method);

            Span span = ContextManager.createSpan(connectInfo.getDBType() + "/JDBI/PreparedStatement/" + method);

            Tags.DB_TYPE.set(span, "sql");

            Tags.DB_INSTANCE.set(span, connectInfo.getDatabaseName());

            Tags.DB_STATEMENT.set(span, sql);