for #1172, refactor OpenTracingSQLExecutionHook

apache · Sep 25, 2018 · b6de854 · b6de854
1 parent 74c7bae
commit b6de854
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/...ng-core/src/main/java/io/shardingsphere/core/executor/sql/execute/SQLExecuteCallback.java b/...ng-core/src/main/java/io/shardingsphere/core/executor/sql/execute/SQLExecuteCallback.java
@@ -83,8 +83,8 @@ private T execute0(final StatementExecuteUnit statementExecuteUnit, final boolea
         try {
             sqlExecutionHook.start(statementExecuteUnit.getRouteUnit(), dataSourceMetaData, isTrunkThread);
             T result = executeSQL(statementExecuteUnit);
+            sqlExecutionHook.finishSuccess();
             for (List<Object> each : parameterSets) {
-                sqlExecutionHook.finishSuccess();
                 // TODO remove after BED removed
                 SQLExecutionEvent finishEvent = SQLExecutionEventFactory.createEvent(sqlType, statementExecuteUnit, each, dataSourceMetaData);
                 finishEvent.setExecuteSuccess();

diff --git a/...tracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java b/...tracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java
@@ -75,20 +75,16 @@ private List<String> toStringList(final List<List<Object>> parameterSets) {
 
     @Override
     public void finishSuccess() {
-        if (null != span) {
-            span.finish();
-        }
+        span.finish();
         if (null != activeSpan) {
             activeSpan.deactivate();
         }
     }
 
     @Override
     public void finishFailure(final Exception cause) {
-        if (null != span) {
-            ShardingErrorSpan.setError(span, cause);
-            span.finish();
-        }
+        ShardingErrorSpan.setError(span, cause);
+        span.finish();
         if (null != activeSpan) {
             activeSpan.deactivate();
         }