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

Merge pull request #102 from ascrutae/feature/3.0 

fix some issue
parents ff5f08ea d8d916a2

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.INSTANCE.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.INSTANCE.createSpan("JDBC/CallableStatement/" + method);

            Span span = ContextManager.INSTANCE.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.INSTANCE.createSpan("JDBC/Connection/" + method);

            Span span = ContextManager.INSTANCE.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.INSTANCE.createSpan("JDBC/PreparedStatement/" + method);

            Span span = ContextManager.INSTANCE.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);

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

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

            throws SQLException {

        try {

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

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

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

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

            Tags.DB_STATEMENT.set(span, sql);