Initial implementation of SQL client tracing

eclipse-vertx · May 22, 2020 · 624a111 · 624a111
1 parent f9792f8
commit 624a111
Show file tree

Hide file tree

Showing 20 changed files with 470 additions and 63 deletions.
diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionImpl.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionImpl.java
@@ -26,6 +26,7 @@
 import io.vertx.db2client.impl.command.PingCommand;
 import io.vertx.sqlclient.impl.Connection;
 import io.vertx.sqlclient.impl.SqlConnectionImpl;
+import io.vertx.sqlclient.impl.tracing.SqlTracer;
 
 public class DB2ConnectionImpl extends SqlConnectionImpl<DB2ConnectionImpl> implements DB2Connection {
 
@@ -37,21 +38,22 @@ public static Future<DB2Connection> connect(Vertx vertx, DB2ConnectOptions optio
     } catch (Exception e) {
       return ctx.failedFuture(e);
     }
+    SqlTracer tracer = ctx.tracer() == null ? null : new SqlTracer(ctx.tracer(), options);
     Promise<DB2Connection> promise = ctx.promise();
-    ctx.dispatch(null, v -> connect(client, ctx, promise));
+    ctx.dispatch(null, v -> connect(client, ctx, tracer, promise));
     return promise.future();
   }
 
-  private static void connect(DB2ConnectionFactory client, ContextInternal ctx, Promise<DB2Connection> promise) {
+  private static void connect(DB2ConnectionFactory client, ContextInternal ctx, SqlTracer tracer, Promise<DB2Connection> promise) {
     client.connect().map(conn -> {
-      DB2ConnectionImpl db2Connection = new DB2ConnectionImpl(client, ctx, conn);
+      DB2ConnectionImpl db2Connection = new DB2ConnectionImpl(client, ctx, conn, tracer);
       conn.init(db2Connection);
       return (DB2Connection) db2Connection;
     }).onComplete(promise);
   }
 
-  public DB2ConnectionImpl(DB2ConnectionFactory factory, ContextInternal context, Connection conn) {
-    super(context, conn);
+  public DB2ConnectionImpl(DB2ConnectionFactory factory, ContextInternal context, Connection conn, SqlTracer tracer) {
+    super(context, conn, tracer);
   }
 
   @Override

diff --git a/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2PoolImpl.java b/vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2PoolImpl.java
@@ -25,12 +25,14 @@
 import io.vertx.sqlclient.impl.Connection;
 import io.vertx.sqlclient.impl.PoolBase;
 import io.vertx.sqlclient.impl.SqlConnectionImpl;
+import io.vertx.sqlclient.impl.tracing.SqlTracer;
 
 public class DB2PoolImpl extends PoolBase<DB2PoolImpl> implements DB2Pool {
 
   public static DB2PoolImpl create(ContextInternal context, boolean closeVertx, DB2ConnectOptions connectOptions,
                                    PoolOptions poolOptions) {
-    DB2PoolImpl pool = new DB2PoolImpl(context, poolOptions, new DB2ConnectionFactory(context, connectOptions));
+    SqlTracer tracer = context.tracer() == null ? null : new SqlTracer(context.tracer(), connectOptions);
+    DB2PoolImpl pool = new DB2PoolImpl(context, poolOptions, new DB2ConnectionFactory(context, connectOptions), tracer);
     CloseFuture closeFuture = pool.closeFuture();
     if (closeVertx) {
       closeFuture.onComplete(ar -> context.owner().close());
@@ -42,8 +44,8 @@ public static DB2PoolImpl create(ContextInternal context, boolean closeVertx, DB
 
   private final DB2ConnectionFactory factory;
 
-  private DB2PoolImpl(ContextInternal context, PoolOptions poolOptions, DB2ConnectionFactory factory) {
-    super(context, factory, poolOptions);
+  private DB2PoolImpl(ContextInternal context, PoolOptions poolOptions, DB2ConnectionFactory factory, SqlTracer tracer) {
+    super(context, factory, tracer, poolOptions);
     this.factory = factory;
   }
 
@@ -55,6 +57,6 @@ public void connect(Handler<AsyncResult<Connection>> completionHandler) {
   @SuppressWarnings("rawtypes")
   @Override
   protected SqlConnectionImpl wrap(ContextInternal context, Connection conn) {
-    return new DB2ConnectionImpl(factory, context, conn);
+    return new DB2ConnectionImpl(factory, context, conn, tracer);
   }
 }
diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionImpl.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionImpl.java
@@ -19,12 +19,13 @@
 import io.vertx.core.Vertx;
 import io.vertx.sqlclient.impl.Connection;
 import io.vertx.sqlclient.impl.SqlConnectionImpl;
+import io.vertx.sqlclient.impl.tracing.SqlTracer;
 
 public class MSSQLConnectionImpl extends SqlConnectionImpl<MSSQLConnectionImpl> implements MSSQLConnection {
   private final MSSQLConnectionFactory factory;
 
-  public MSSQLConnectionImpl(MSSQLConnectionFactory factory, ContextInternal context, Connection conn) {
-    super(context, conn);
+  public MSSQLConnectionImpl(MSSQLConnectionFactory factory, ContextInternal context, Connection conn, SqlTracer tracer) {
+    super(context, conn, tracer);
     this.factory = factory;
   }
 
@@ -36,12 +37,13 @@ public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int cur
 
   public static Future<MSSQLConnection> connect(Vertx vertx, MSSQLConnectOptions options) {
     ContextInternal ctx = (ContextInternal) vertx.getOrCreateContext();
+    SqlTracer tracer = ctx.tracer() == null ? null : new SqlTracer(ctx.tracer(), options);
     PromiseInternal<MSSQLConnection> promise = ctx.promise();
     MSSQLConnectionFactory client = new MSSQLConnectionFactory(ctx, options);
     ctx.dispatch(null, v -> {
       client.connect()
         .<MSSQLConnection>map(conn -> {
-          MSSQLConnectionImpl msConn = new MSSQLConnectionImpl(client, ctx, conn);
+          MSSQLConnectionImpl msConn = new MSSQLConnectionImpl(client, ctx, conn, tracer);
           conn.init(msConn);
           return msConn;
         }).onComplete(promise);

diff --git a/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLPoolImpl.java b/vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLPoolImpl.java
@@ -23,13 +23,15 @@
 import io.vertx.sqlclient.impl.Connection;
 import io.vertx.sqlclient.impl.PoolBase;
 import io.vertx.sqlclient.impl.SqlConnectionImpl;
+import io.vertx.sqlclient.impl.tracing.SqlTracer;
 
 import java.util.function.Function;
 
 public class MSSQLPoolImpl extends PoolBase<MSSQLPoolImpl> implements MSSQLPool {
 
   public static MSSQLPoolImpl create(ContextInternal context, boolean closeVertx, MSSQLConnectOptions connectOptions, PoolOptions poolOptions) {
-    MSSQLPoolImpl pool = new MSSQLPoolImpl(context, new MSSQLConnectionFactory(context, connectOptions), poolOptions);
+    SqlTracer tracer = context.tracer() == null ? null : new SqlTracer(context.tracer(), connectOptions);
+    MSSQLPoolImpl pool = new MSSQLPoolImpl(context, new MSSQLConnectionFactory(context, connectOptions), tracer, poolOptions);
     CloseFuture closeFuture = pool.closeFuture();
     if (closeVertx) {
       closeFuture.onComplete(ar -> context.owner().close());
@@ -41,8 +43,8 @@ public static MSSQLPoolImpl create(ContextInternal context, boolean closeVertx,
 
   private final MSSQLConnectionFactory connectionFactory;
 
-  private MSSQLPoolImpl(ContextInternal context, MSSQLConnectionFactory factory, PoolOptions poolOptions) {
-    super(context, factory, poolOptions);
+  private MSSQLPoolImpl(ContextInternal context, MSSQLConnectionFactory factory, SqlTracer tracer, PoolOptions poolOptions) {
+    super(context, factory, tracer, poolOptions);
     this.connectionFactory = factory;
   }
 
@@ -59,7 +61,7 @@ public void connect(Handler<AsyncResult<Connection>> completionHandler) {
 
   @Override
   protected SqlConnectionImpl wrap(ContextInternal context, Connection connection) {
-    return new MSSQLConnectionImpl(connectionFactory, context, connection);
+    return new MSSQLConnectionImpl(connectionFactory, context, connection, tracer);
   }
 
   @Override

diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionImpl.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionImpl.java
@@ -31,6 +31,7 @@
 import io.vertx.mysqlclient.impl.command.StatisticsCommand;
 import io.vertx.sqlclient.impl.Connection;
 import io.vertx.sqlclient.impl.SqlConnectionImpl;
+import io.vertx.sqlclient.impl.tracing.SqlTracer;
 
 public class MySQLConnectionImpl extends SqlConnectionImpl<MySQLConnectionImpl> implements MySQLConnection {
 
@@ -42,24 +43,25 @@ public static Future<MySQLConnection> connect(Vertx vertx, MySQLConnectOptions o
     } catch (Exception e) {
       return ctx.failedFuture(e);
     }
+    SqlTracer tracer = ctx.tracer() == null ? null : new SqlTracer(ctx.tracer(), options);
     Promise<MySQLConnection> promise = ctx.promise();
-    ctx.dispatch(null, v -> connect(client, ctx, promise));
+    ctx.dispatch(null, v -> connect(client, ctx, tracer, promise));
     return promise.future();
   }
 
-  private static void connect(MySQLConnectionFactory client, ContextInternal ctx, Promise<MySQLConnection> promise) {
+  private static void connect(MySQLConnectionFactory client, ContextInternal ctx, SqlTracer tracer, Promise<MySQLConnection> promise) {
     client.connect()
       .map(conn -> {
-        MySQLConnectionImpl mySQLConnection = new MySQLConnectionImpl(client, ctx, conn);
+        MySQLConnectionImpl mySQLConnection = new MySQLConnectionImpl(client, ctx, conn, tracer);
         conn.init(mySQLConnection);
         return (MySQLConnection) mySQLConnection;
       }).onComplete(promise);
   }
 
   private final MySQLConnectionFactory factory;
 
-  public MySQLConnectionImpl(MySQLConnectionFactory factory, ContextInternal context, Connection conn) {
-    super(context, conn);
+  public MySQLConnectionImpl(MySQLConnectionFactory factory, ContextInternal context, Connection conn, SqlTracer tracer) {
+    super(context, conn, tracer);
 
     this.factory = factory;
   }

diff --git a/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLPoolImpl.java b/vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLPoolImpl.java
@@ -21,11 +21,13 @@
 import io.vertx.sqlclient.impl.Connection;
 import io.vertx.sqlclient.impl.PoolBase;
 import io.vertx.sqlclient.impl.SqlConnectionImpl;
+import io.vertx.sqlclient.impl.tracing.SqlTracer;
 
 public class MySQLPoolImpl extends PoolBase<MySQLPoolImpl> implements MySQLPool {
 
   public static MySQLPoolImpl create(ContextInternal context, boolean closeVertx, MySQLConnectOptions connectOptions, PoolOptions poolOptions) {
-    MySQLPoolImpl pool = new MySQLPoolImpl(context, new MySQLConnectionFactory(context, connectOptions), poolOptions);
+    SqlTracer tracer = context.tracer() == null ? null : new SqlTracer(context.tracer(), connectOptions);
+    MySQLPoolImpl pool = new MySQLPoolImpl(context, new MySQLConnectionFactory(context, connectOptions), tracer, poolOptions);
     CloseFuture closeFuture = pool.closeFuture();
     if (closeVertx) {
       closeFuture.onComplete(ar -> context.owner().close());
@@ -37,8 +39,8 @@ public static MySQLPoolImpl create(ContextInternal context, boolean closeVertx,
 
   private final MySQLConnectionFactory factory;
 
-  private MySQLPoolImpl(ContextInternal context, MySQLConnectionFactory factory, PoolOptions poolOptions) {
-    super(context, factory, poolOptions);
+  private MySQLPoolImpl(ContextInternal context, MySQLConnectionFactory factory, SqlTracer tracer, PoolOptions poolOptions) {
+    super(context, factory, tracer, poolOptions);
     this.factory = factory;
   }
 
@@ -49,6 +51,6 @@ public void connect(Handler<AsyncResult<Connection>> completionHandler) {
 
   @Override
   protected SqlConnectionImpl wrap(ContextInternal context, Connection conn) {
-    return new MySQLConnectionImpl(factory, context, conn);
+    return new MySQLConnectionImpl(factory, context, conn, tracer);
   }
 }
diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionImpl.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionImpl.java
@@ -28,6 +28,7 @@
 import io.vertx.core.Future;
 import io.vertx.core.Handler;
 import io.vertx.core.Vertx;
+import io.vertx.sqlclient.impl.tracing.SqlTracer;
 
 public class PgConnectionImpl extends SqlConnectionImpl<PgConnectionImpl> implements PgConnection  {
 
@@ -38,7 +39,8 @@ public static Future<PgConnection> connect(ContextInternal context, PgConnectOpt
       PgConnectionFactory client = new PgConnectionFactory(context.owner(), context, options);
       return client.connect()
         .map(conn -> {
-        PgConnectionImpl pgConn = new PgConnectionImpl(client, context, conn);
+        SqlTracer tracer = context.tracer() == null ? null : new SqlTracer(context.tracer(), options);
+        PgConnectionImpl pgConn = new PgConnectionImpl(client, context, conn, tracer);
         conn.init(pgConn);
         return pgConn;
       });
@@ -48,8 +50,8 @@ public static Future<PgConnection> connect(ContextInternal context, PgConnectOpt
   private final PgConnectionFactory factory;
   private volatile Handler<PgNotification> notificationHandler;
 
-  PgConnectionImpl(PgConnectionFactory factory, ContextInternal context, Connection conn) {
-    super(context, conn);
+  PgConnectionImpl(PgConnectionFactory factory, ContextInternal context, Connection conn, SqlTracer tracer) {
+    super(context, conn, tracer);
 
     this.factory = factory;
   }

diff --git a/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgPoolImpl.java b/vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgPoolImpl.java
@@ -25,6 +25,7 @@
 import io.vertx.sqlclient.impl.PoolBase;
 import io.vertx.sqlclient.impl.SqlConnectionImpl;
 import io.vertx.core.*;
+import io.vertx.sqlclient.impl.tracing.SqlTracer;
 
 /**
  * Todo :
@@ -38,7 +39,8 @@
 public class PgPoolImpl extends PoolBase<PgPoolImpl> implements PgPool {
 
   public static PgPoolImpl create(ContextInternal context, boolean closeVertx, PgConnectOptions connectOptions, PoolOptions poolOptions) {
-    PgPoolImpl pool = new PgPoolImpl(context, new PgConnectionFactory(context.owner(), context, connectOptions), poolOptions);
+    SqlTracer tracer = context.tracer() == null ? null : new SqlTracer(context.tracer(), connectOptions);
+    PgPoolImpl pool = new PgPoolImpl(context, new PgConnectionFactory(context.owner(), context, connectOptions), tracer, poolOptions);
     CloseFuture closeFuture = pool.closeFuture();
     if (closeVertx) {
       closeFuture.onComplete(ar -> context.owner().close());
@@ -50,8 +52,8 @@ public static PgPoolImpl create(ContextInternal context, boolean closeVertx, PgC
 
   private final PgConnectionFactory factory;
 
-  private PgPoolImpl(ContextInternal context, PgConnectionFactory factory, PoolOptions poolOptions) {
-    super(context, factory, poolOptions);
+  private PgPoolImpl(ContextInternal context, PgConnectionFactory factory, SqlTracer tracer, PoolOptions poolOptions) {
+    super(context, factory, tracer, poolOptions);
     this.factory = factory;
   }
 
@@ -68,6 +70,6 @@ public void connect(Handler<AsyncResult<Connection>> completionHandler) {
 
   @Override
   protected SqlConnectionImpl wrap(ContextInternal context, Connection conn) {
-    return new PgConnectionImpl(factory, context, conn);
+    return new PgConnectionImpl(factory, context, conn, tracer);
   }
 }