for #1172, refactor OpenTracingRootInvokeHook

apache · Sep 25, 2018 · 7028929 · 7028929
1 parent 8b88cda
commit 7028929
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 37 deletions.
diff --git a/...entracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingRootInvokeHook.java b/...entracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingRootInvokeHook.java
@@ -25,45 +25,26 @@
 import io.shardingsphere.opentracing.constant.ShardingTags;
 
 /**
- * Open tracing root invoke handler.
+ * Open tracing root invoke hook.
  *
  * @author zhangliang
  */
 public final class OpenTracingRootInvokeHook implements RootInvokeHook {
 
-    public static final String ROOT_SPAN_CONTINUATION = "ROOT_SPAN_CONTINUATION";
+    public static final String ACTIVE_SPAN_CONTINUATION = "ACTIVE_SPAN_CONTINUATION";
 
     private static final String OPERATION_NAME = "/" + ShardingTags.COMPONENT_NAME + "/rootInvoke/";
 
-    private static final ThreadLocal<ActiveSpan> ACTIVE_SPAN = new ThreadLocal<>();
+    private ActiveSpan activeSpan;
 
     @Override
     public void start() {
-        ACTIVE_SPAN.set(ShardingTracer.get().buildSpan(OPERATION_NAME).withTag(Tags.COMPONENT.getKey(), ShardingTags.COMPONENT_NAME).startActive());
-        ExecutorDataMap.getDataMap().put(ROOT_SPAN_CONTINUATION, ACTIVE_SPAN.get().capture());
+        activeSpan = ShardingTracer.get().buildSpan(OPERATION_NAME).withTag(Tags.COMPONENT.getKey(), ShardingTags.COMPONENT_NAME).startActive();
+        ExecutorDataMap.getDataMap().put(ACTIVE_SPAN_CONTINUATION, activeSpan.capture());
     }
 
     @Override
     public void finish(final int connectionCount) {
-        ACTIVE_SPAN.get().setTag(ShardingTags.CONNECTION_COUNT.getKey(), connectionCount).deactivate();
-        ACTIVE_SPAN.remove();
-    }
-
-    /**
-     * 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 null != ACTIVE_SPAN.get();
-    }
-
-    /**
-     * Get active span.
-     *
-     * @return active span
-     */
-    public static ThreadLocal<ActiveSpan> getActiveSpan() {
-        return ACTIVE_SPAN;
+        activeSpan.setTag(ShardingTags.CONNECTION_COUNT.getKey(), connectionCount).deactivate();
     }
 }
diff --git a/...tracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java b/...tracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java
@@ -45,7 +45,7 @@ public final class OpenTracingSQLExecutionHook implements SQLExecutionHook {
     @Override
     public void start(final String dataSourceName, final String sql, final List<Object> parameters, final DataSourceMetaData dataSourceMetaData, final boolean isTrunkThread) {
         if (!isTrunkThread) {
-            activeSpan = ((ActiveSpan.Continuation) ExecutorDataMap.getDataMap().get(OpenTracingRootInvokeHook.ROOT_SPAN_CONTINUATION)).activate();
+            activeSpan = ((ActiveSpan.Continuation) ExecutorDataMap.getDataMap().get(OpenTracingRootInvokeHook.ACTIVE_SPAN_CONTINUATION)).activate();
         }
         span = ShardingTracer.get().buildSpan(OPERATION_NAME)
                 .withTag(Tags.COMPONENT.getKey(), ShardingTags.COMPONENT_NAME)

diff --git a/...opentracing/src/test/java/io/shardingsphere/opentracing/hook/BaseOpenTracingHookTest.java b/...opentracing/src/test/java/io/shardingsphere/opentracing/hook/BaseOpenTracingHookTest.java
@@ -54,7 +54,7 @@ public static MockTracer getTracer() {
     @BeforeClass
     public static void initTracer() {
         ShardingTracer.init(TRACER);
-        ExecutorDataMap.getDataMap().remove(OpenTracingRootInvokeHook.ROOT_SPAN_CONTINUATION);
+        ExecutorDataMap.getDataMap().remove(OpenTracingRootInvokeHook.ACTIVE_SPAN_CONTINUATION);
     }
 
     @AfterClass

diff --git a/...acing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingRootInvokeHookTest.java b/...acing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingRootInvokeHookTest.java
@@ -22,9 +22,6 @@
 import io.shardingsphere.core.spi.root.SPIRootInvokeHook;
 import org.junit.Test;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 public final class OpenTracingRootInvokeHookTest extends BaseOpenTracingHookTest {
@@ -34,11 +31,7 @@ public final class OpenTracingRootInvokeHookTest extends BaseOpenTracingHookTest
     @Test
     public void assertRootInvoke() {
         rootInvokeHook.start();
-        assertTrue(OpenTracingRootInvokeHook.isTrunkThread());
-        assertNotNull(OpenTracingRootInvokeHook.getActiveSpan().get());
-        assertTrue(ExecutorDataMap.getDataMap().containsKey(OpenTracingRootInvokeHook.ROOT_SPAN_CONTINUATION));
+        assertTrue(ExecutorDataMap.getDataMap().containsKey(OpenTracingRootInvokeHook.ACTIVE_SPAN_CONTINUATION));
         rootInvokeHook.finish(1);
-        assertFalse(OpenTracingRootInvokeHook.isTrunkThread());
-        assertNull(OpenTracingRootInvokeHook.getActiveSpan().get());
     }
 }
diff --git a/...ing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHookTest.java b/...ing/src/test/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHookTest.java
@@ -57,13 +57,13 @@ private ActiveSpan mockActiveSpan() {
         Continuation continuation = mock(Continuation.class);
         ActiveSpan result = mock(ActiveSpan.class);
         when(continuation.activate()).thenReturn(result);
-        ExecutorDataMap.getDataMap().put(OpenTracingRootInvokeHook.ROOT_SPAN_CONTINUATION, continuation);
+        ExecutorDataMap.getDataMap().put(OpenTracingRootInvokeHook.ACTIVE_SPAN_CONTINUATION, continuation);
         return result;
     }
 
     @After
     public void tearDown() {
-        ExecutorDataMap.getDataMap().remove(OpenTracingRootInvokeHook.ROOT_SPAN_CONTINUATION);
+        ExecutorDataMap.getDataMap().remove(OpenTracingRootInvokeHook.ACTIVE_SPAN_CONTINUATION);
     }
 
     @Test