From b6de854b51f499b48364bd01150d3dcc1c1ed8c1 Mon Sep 17 00:00:00 2001
From: terrymanu <terrymanu@163.com>
Date: Wed, 26 Sep 2018 01:39:36 +0800
Subject: [PATCH] for #1172, refactor OpenTracingSQLExecutionHook

---
 .../core/executor/sql/execute/SQLExecuteCallback.java  |  2 +-
 .../opentracing/hook/OpenTracingSQLExecutionHook.java  | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sharding-core/src/main/java/io/shardingsphere/core/executor/sql/execute/SQLExecuteCallback.java b/sharding-core/src/main/java/io/shardingsphere/core/executor/sql/execute/SQLExecuteCallback.java
index bd51b5b9ae5cc..0fa527abfea2a 100644
--- a/sharding-core/src/main/java/io/shardingsphere/core/executor/sql/execute/SQLExecuteCallback.java
+++ b/sharding-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/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java b/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java
index 9f168c202c6e0..c8e9cd45b2033 100644
--- a/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java
+++ b/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/hook/OpenTracingSQLExecutionHook.java
@@ -75,9 +75,7 @@ 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();
         }
@@ -85,10 +83,8 @@ public void finishSuccess() {
     
     @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();
         }