Merge pull request #1286 from tuohai666/dev

#1172, add connection.count
apache · Sep 20, 2018 · 89a1fd0 · 89a1fd0
2 parents 78431e1 + 37463ef
commit 89a1fd0
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/...-core/src/main/java/io/shardingsphere/core/event/connection/GetConnectionFinishEvent.java b/...-core/src/main/java/io/shardingsphere/core/event/connection/GetConnectionFinishEvent.java
@@ -30,5 +30,7 @@
 @Getter
 public final class GetConnectionFinishEvent extends GetConnectionEvent {
 
+    private final int connectionCount;
+
     private final DataSourceMetaData dataSourceMetaData;
 }
diff --git a/...ing-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java b/...ing-jdbc/src/main/java/io/shardingsphere/core/jdbc/adapter/AbstractConnectionAdapter.java
@@ -131,7 +131,7 @@ private List<Connection> createConnections(final DataSource dataSource, final in
     }
 
     private void postGetConnectionEvent(final List<Connection> connections) throws SQLException {
-        GetConnectionEvent finishEvent = new GetConnectionFinishEvent(DataSourceMetaDataFactory.newInstance(databaseType, connections.get(0).getMetaData().getURL()));
+        GetConnectionEvent finishEvent = new GetConnectionFinishEvent(connections.size(), DataSourceMetaDataFactory.newInstance(databaseType, connections.get(0).getMetaData().getURL()));
         finishEvent.setExecuteSuccess();
         ShardingEventBusInstance.getInstance().post(finishEvent);
     }

diff --git a/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/ShardingTags.java b/sharding-opentracing/src/main/java/io/shardingsphere/opentracing/ShardingTags.java
@@ -38,4 +38,9 @@ public final class ShardingTags {
      * Records the bind variables of SQL.
      */
     public static final StringTag DB_BIND_VARIABLES = new StringTag("db.bind_vars");
+
+    /**
+     * Records the connection count.
+     */
+    public static final StringTag CONNECTION_COUNT = new StringTag("connection.count");
 }
diff --git a/...cing/src/main/java/io/shardingsphere/opentracing/listener/GetConnectionEventListener.java b/...cing/src/main/java/io/shardingsphere/opentracing/listener/GetConnectionEventListener.java
@@ -60,7 +60,9 @@ protected void tracingFinish(final GetConnectionEvent event) {
         GetConnectionFinishEvent finishEvent = (GetConnectionFinishEvent) event;
         Span span = getSpan().get();
         if (null != finishEvent.getDataSourceMetaData()) {
-            span = span.setTag(Tags.PEER_HOSTNAME.getKey(), finishEvent.getDataSourceMetaData().getHostName()).setTag(Tags.PEER_PORT.getKey(), finishEvent.getDataSourceMetaData().getPort());
+            span = span.setTag(Tags.PEER_HOSTNAME.getKey(), finishEvent.getDataSourceMetaData().getHostName())
+                .setTag(ShardingTags.CONNECTION_COUNT.getKey(), ((GetConnectionFinishEvent) event).getConnectionCount())
+                .setTag(Tags.PEER_PORT.getKey(), finishEvent.getDataSourceMetaData().getPort());
         }
         span.finish();
         getSpan().remove();

diff --git a/...roxy/src/main/java/io/shardingsphere/proxy/backend/jdbc/connection/BackendConnection.java b/...roxy/src/main/java/io/shardingsphere/proxy/backend/jdbc/connection/BackendConnection.java
@@ -71,14 +71,14 @@ public List<Connection> getConnections(final String dataSourceName, final int co
             ShardingEventBusInstance.getInstance().post(new GetConnectionStartEvent(dataSourceName));
             List<Connection> result = ruleRegistry.getBackendDataSource().getConnections(dataSourceName, connectionSize);
             cachedConnections.addAll(result);
-            GetConnectionEvent finishEvent = new GetConnectionFinishEvent(DataSourceMetaDataFactory.newInstance(DatabaseType.MySQL, result.get(0).getMetaData().getURL()));
+            GetConnectionEvent finishEvent = new GetConnectionFinishEvent(result.size(), DataSourceMetaDataFactory.newInstance(DatabaseType.MySQL, result.get(0).getMetaData().getURL()));
             finishEvent.setExecuteSuccess();
             ShardingEventBusInstance.getInstance().post(finishEvent);
             return result;
             // CHECKSTYLE:OFF
         } catch (final Exception ex) {
             // CHECKSTYLE:ON
-            GetConnectionEvent finishEvent = new GetConnectionFinishEvent(null);
+            GetConnectionEvent finishEvent = new GetConnectionFinishEvent(0, null);
             finishEvent.setExecuteFailure(ex);
             ShardingEventBusInstance.getInstance().post(finishEvent);
             throw ex;