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

Merge branch 'master' into feature/358

parents b671d634 65cd3d75

apm-sniffer/apm-agent-core/src/main/java/org/skywalking/apm/agent/core/context/ContextManager.java

+6 −0
Original line number Diff line number Diff line
@@ -108,6 +108,12 @@ public class ContextManager implements TracingContextListener, BootService, Igno 
        return span;

    }



    public static AbstractSpan createExitSpan(String operationName, String remotePeer) {

        AbstractTracerContext context = getOrCreate(operationName, false);

        AbstractSpan span = context.createExitSpan(operationName, remotePeer);

        return span;

    }



    public static void inject(ContextCarrier carrier) {

        get().inject(carrier);

    }

apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/CallableStatementTracing.java

+1 −2
Original line number Diff line number Diff line 
package org.skywalking.apm.plugin.jdbc;



import java.sql.SQLException;

import org.skywalking.apm.agent.core.context.ContextCarrier;

import org.skywalking.apm.agent.core.context.ContextManager;

import org.skywalking.apm.agent.core.context.tag.Tags;

import org.skywalking.apm.agent.core.context.trace.AbstractSpan;
@@ -20,7 +19,7 @@ public class CallableStatementTracing { 
            } else {

                remotePeer = connectInfo.getHost() + ":" + connectInfo.getPort();

            }

            AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/CallableStatement/" + method, new ContextCarrier(), remotePeer);

            AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/CallableStatement/" + method, remotePeer);

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

            SpanLayer.asDB(span);

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

apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/ConnectionTracing.java

+1 −2
Original line number Diff line number Diff line 
package org.skywalking.apm.plugin.jdbc;



import java.sql.SQLException;

import org.skywalking.apm.agent.core.context.ContextCarrier;

import org.skywalking.apm.agent.core.context.ContextManager;

import org.skywalking.apm.agent.core.context.tag.Tags;

import org.skywalking.apm.agent.core.context.trace.AbstractSpan;
@@ -20,7 +19,7 @@ public class ConnectionTracing { 
            } else {

                remotePeer = connectInfo.getHost() + ":" + connectInfo.getPort();

            }

            AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/Connection/" + method, new ContextCarrier(), remotePeer);

            AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/Connection/" + method, remotePeer);

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

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

            Tags.DB_STATEMENT.set(span, sql);

apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/PreparedStatementTracing.java

+1 −2
Original line number Diff line number Diff line 
package org.skywalking.apm.plugin.jdbc;



import java.sql.SQLException;

import org.skywalking.apm.agent.core.context.ContextCarrier;

import org.skywalking.apm.agent.core.context.ContextManager;

import org.skywalking.apm.agent.core.context.tag.Tags;

import org.skywalking.apm.agent.core.context.trace.AbstractSpan;
@@ -21,7 +20,7 @@ public class PreparedStatementTracing { 
                remotePeer = connectInfo.getHost() + ":" + connectInfo.getPort();

            }



            AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/PreparedStatement/" + method, new ContextCarrier(), remotePeer);

            AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/PreparedStatement/" + method, remotePeer);

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

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

            Tags.DB_STATEMENT.set(span, sql);

apm-sniffer/apm-sdk-plugin/jdbc-plugin/src/main/java/org/skywalking/apm/plugin/jdbc/StatementTracing.java

+1 −2
Original line number Diff line number Diff line 
package org.skywalking.apm.plugin.jdbc;



import java.sql.SQLException;

import org.skywalking.apm.agent.core.context.ContextCarrier;

import org.skywalking.apm.agent.core.context.ContextManager;

import org.skywalking.apm.agent.core.context.tag.Tags;

import org.skywalking.apm.agent.core.context.trace.AbstractSpan;
@@ -20,7 +19,7 @@ public class StatementTracing { 
                remotePeer = connectInfo.getHost() + ":" + connectInfo.getPort();

            }



            AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/Statement/" + method, new ContextCarrier(), remotePeer);

            AbstractSpan span = ContextManager.createExitSpan(connectInfo.getDBType() + "/JDBI/Statement/" + method, remotePeer);

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

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

            Tags.DB_STATEMENT.set(span, sql);