Unverified Commit 807de0c3 authored by 张亮's avatar 张亮 Committed by GitHub
Browse files

Merge pull request #1162 from beckhampu/dev 

remove trunk span in OverallExecuteEventListener
parents 8a32428a 548fc0c2

sharding-opentracing/src/main/java/io/shardingsphere/opentracing/listener/execution/OverallExecuteEventListener.java

+10 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ public final class OverallExecuteEventListener extends OpenTracingListener<Overa 


    private static final String OPERATION_NAME_PREFIX = "/SHARDING-SPHERE/EXECUTE/";



    private final ThreadLocal<ActiveSpan> span = new ThreadLocal<>();

    private static final ThreadLocal<ActiveSpan> span = new ThreadLocal<>();

    

    /**

     * Listen overall sql execution event.
@@ -72,4 +72,13 @@ public final class OverallExecuteEventListener extends OpenTracingListener<Overa 
    protected ActiveSpan getFailureSpan() {

        return span.get();

    }

    

    /**

     * Tests if sql execute event in this overall event thread.

     * 

     * @return sql execute event in this overall event thread or not.

     */

    public static boolean isTrunkThread() {

        return span.get() != null;

    }

}

sharding-opentracing/src/main/java/io/shardingsphere/opentracing/listener/execution/SQLExecuteEventListener.java

+1 −3
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ public final class SQLExecuteEventListener extends OpenTracingListener<SQLExecut 
    

    private static final String SNAPSHOT_DATA_KEY = "OPENTRACING_SNAPSHOT_DATA";



    private final ThreadLocal<ActiveSpan> trunkSpan = new ThreadLocal<>();

    

    private final ThreadLocal<Span> branchSpan = new ThreadLocal<>();

    

    private final ThreadLocal<ActiveSpan> trunkInBranchSpan = new ThreadLocal<>();
@@ -61,7 +59,7 @@ public final class SQLExecuteEventListener extends OpenTracingListener<SQLExecut 
    

    @Override

    protected void beforeExecute(final SQLExecutionEvent event) {

        if (ExecutorDataMap.getDataMap().containsKey(SNAPSHOT_DATA_KEY) && null == trunkSpan.get() && null == branchSpan.get()) {

        if (ExecutorDataMap.getDataMap().containsKey(SNAPSHOT_DATA_KEY) && !OverallExecuteEventListener.isTrunkThread() && null == branchSpan.get()) {

            trunkInBranchSpan.set(((ActiveSpan.Continuation) ExecutorDataMap.getDataMap().get(SNAPSHOT_DATA_KEY)).activate());

        }

        if (null == branchSpan.get()) {