Minor refactoring

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

Author: tsegismont

vertx-sql-client/src/main/java/io/vertx/sqlclient/impl/pool/SqlConnectionPool.java

@@ -13,22 +13,22 @@
 
 import io.netty.channel.EventLoop;
 import io.vertx.core.*;
+import io.vertx.core.internal.ContextInternal;
 import io.vertx.core.internal.PromiseInternal;
+import io.vertx.core.internal.VertxInternal;
 import io.vertx.core.internal.net.NetSocketInternal;
+import io.vertx.core.internal.pool.*;
 import io.vertx.core.net.SocketAddress;
 import io.vertx.core.spi.metrics.ClientMetrics;
 import io.vertx.core.spi.metrics.PoolMetrics;
 import io.vertx.core.spi.tracing.VertxTracer;
 import io.vertx.core.tracing.TracingPolicy;
-import io.vertx.core.internal.pool.*;
-import io.vertx.core.internal.ContextInternal;
-import io.vertx.core.internal.VertxInternal;
 import io.vertx.sqlclient.SqlConnection;
+import io.vertx.sqlclient.impl.tracing.QueryReporter;
 import io.vertx.sqlclient.internal.Connection;
 import io.vertx.sqlclient.internal.SqlConnectionBase;
 import io.vertx.sqlclient.internal.command.CommandBase;
 import io.vertx.sqlclient.internal.command.QueryCommandBase;
-import io.vertx.sqlclient.impl.tracing.QueryReporter;
 import io.vertx.sqlclient.spi.ConnectionFactory;
 import io.vertx.sqlclient.spi.DatabaseMetadata;
 
@@ -211,8 +211,8 @@ public <R> void execute(CommandBase<R> cmd, Completable<R> handler) {
     p.future().compose(lease -> {
       dequeueMetric(metric);
       PooledConnection pooled = lease.get();
+      pooled.timerMetric = beginMetric();
       Connection conn = pooled.conn;
-      Object useMetric = beginMetric();
 
       Future<R> future;
       if (afterAcquire != null) {
@@ -225,7 +225,7 @@ public <R> void execute(CommandBase<R> cmd, Completable<R> handler) {
         future = pp;
       }
       return future.andThen(ar -> {
-        endMetric(useMetric);
+        endMetric(pooled.timerMetric);
         pooled.refresh();
         lease.recycle();
       });
@@ -268,7 +268,7 @@ public void complete(Lease<PooledConnection> lease, Throwable failure) {
       private void handle(Lease<PooledConnection> lease) {
         dequeueMetric(metric);
         PooledConnection pooled = lease.get();
-        pooled.usage = beginMetric();
+        pooled.timerMetric = beginMetric();
         pooled.lease = lease;
         handler.succeed(pooled);
       }
@@ -328,7 +328,7 @@ public class PooledConnection implements Connection, Connection.Holder {
     private Holder holder;
     private Promise<ConnectResult<PooledConnection>> poolCallback;
     private Lease<PooledConnection> lease;
-    private Object usage;
+    private Object timerMetric;
     public long idleEvictionTimestamp;
     public long lifetimeEvictionTimestamp;
 
@@ -469,7 +469,7 @@ private void doClose(Holder holder, Completable<Void> promise) {
     }
 
     private void cleanup(Completable<Void> promise) {
-      endMetric(usage);
+      endMetric(timerMetric);
       Lease<PooledConnection> l = this.lease;
       this.lease = null;
       refresh();