Skip to content

Commit d1cde8b

Browse files
vietjvietj
committed
Metrics and Tracing are now handled related to the connection and reported by a dedicated reporter around the command scheduler when it can access a connection.
1 parent d866828 commit d1cde8b

File tree

38 files changed

+397
-389
lines changed

38 files changed

+397
-389
lines changed

‎vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionFactory.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,14 @@
2222
import io.vertx.core.impl.EventLoopContext;
2323
import io.vertx.core.impl.VertxInternal;
2424
import io.vertx.core.net.NetClient;
25-
import io.vertx.core.net.NetClientOptions;
2625
import io.vertx.core.net.SocketAddress;
2726
import io.vertx.core.net.impl.NetSocketInternal;
27+
import io.vertx.core.spi.metrics.ClientMetrics;
28+
import io.vertx.core.spi.metrics.VertxMetrics;
2829
import io.vertx.db2client.DB2ConnectOptions;
29-
import io.vertx.sqlclient.SqlConnectOptions;
3030
import io.vertx.sqlclient.SqlConnection;
3131
import io.vertx.sqlclient.impl.Connection;
3232
import io.vertx.sqlclient.impl.ConnectionFactoryBase;
33-
import io.vertx.sqlclient.impl.tracing.QueryTracer;
3433

3534
import java.util.Map;
3635
import java.util.function.Predicate;
@@ -55,7 +54,9 @@ protected Future<Connection> doConnectInternal(DB2ConnectOptions options, EventL
5554
int pipeliningLimit = options.getPipeliningLimit();
5655
NetClient netClient = netClient(options);
5756
return netClient.connect(server).flatMap(so -> {
58-
DB2SocketConnection conn = new DB2SocketConnection((NetSocketInternal) so, cachePreparedStatements,
57+
VertxMetrics vertxMetrics = vertx.metricsSPI();
58+
ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(options.getSocketAddress(), "sql", options.getMetricsName()) : null;
59+
DB2SocketConnection conn = new DB2SocketConnection((NetSocketInternal) so, metrics, options, cachePreparedStatements,
5960
preparedStatementCacheSize, preparedStatementCacheSqlFilter, pipeliningLimit, context);
6061
conn.init();
6162
return Future.future(p -> conn.sendStartupMessage(username, password, database, properties, p));
@@ -65,11 +66,10 @@ protected Future<Connection> doConnectInternal(DB2ConnectOptions options, EventL
6566
@Override
6667
public Future<SqlConnection> connect(Context context, DB2ConnectOptions options) {
6768
ContextInternal contextInternal = (ContextInternal) context;
68-
QueryTracer tracer = contextInternal.tracer() == null ? null : new QueryTracer(contextInternal.tracer(), options);
6969
Promise<SqlConnection> promise = contextInternal.promise();
7070
connect(asEventLoopContext(contextInternal), options)
7171
.map(conn -> {
72-
DB2ConnectionImpl db2Connection = new DB2ConnectionImpl(contextInternal, this, conn, tracer, null);
72+
DB2ConnectionImpl db2Connection = new DB2ConnectionImpl(contextInternal, this, conn);
7373
conn.init(db2Connection);
7474
return (SqlConnection)db2Connection;
7575
}).onComplete(promise);

‎vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2ConnectionImpl.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.vertx.core.Future;
1919
import io.vertx.core.Vertx;
2020
import io.vertx.core.impl.ContextInternal;
21-
import io.vertx.core.spi.metrics.ClientMetrics;
2221
import io.vertx.db2client.DB2ConnectOptions;
2322
import io.vertx.db2client.DB2Connection;
2423
import io.vertx.db2client.impl.command.PingCommand;
@@ -42,8 +41,8 @@ public static Future<DB2Connection> connect(Vertx vertx, DB2ConnectOptions optio
4241
return (Future) client.connect(ctx, options);
4342
}
4443

45-
public DB2ConnectionImpl(ContextInternal context, ConnectionFactory factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
46-
super(context, factory, conn, DB2Driver.INSTANCE, tracer, metrics);
44+
public DB2ConnectionImpl(ContextInternal context, ConnectionFactory factory, Connection conn) {
45+
super(context, factory, conn, DB2Driver.INSTANCE);
4746
}
4847

4948
@Override

‎vertx-db2-client/src/main/java/io/vertx/db2client/impl/DB2SocketConnection.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@
2222
import io.vertx.core.AsyncResult;
2323
import io.vertx.core.Handler;
2424
import io.vertx.core.Promise;
25-
import io.vertx.core.impl.ContextInternal;
2625
import io.vertx.core.impl.EventLoopContext;
2726
import io.vertx.core.net.impl.NetSocketInternal;
27+
import io.vertx.core.spi.metrics.ClientMetrics;
28+
import io.vertx.db2client.DB2ConnectOptions;
2829
import io.vertx.db2client.impl.codec.DB2Codec;
2930
import io.vertx.db2client.impl.command.InitialHandshakeCommand;
3031
import io.vertx.db2client.impl.drda.ConnectionMetaData;
32+
import io.vertx.sqlclient.SqlConnectOptions;
3133
import io.vertx.sqlclient.impl.Connection;
3234
import io.vertx.sqlclient.impl.QueryResultHandler;
3335
import io.vertx.sqlclient.impl.SocketConnectionBase;
@@ -40,17 +42,21 @@
4042

4143
public class DB2SocketConnection extends SocketConnectionBase {
4244

45+
private final DB2ConnectOptions connectOptions;
4346
private DB2Codec codec;
4447
private Handler<Void> closeHandler;
4548
public final ConnectionMetaData connMetadata = new ConnectionMetaData();
4649

4750
public DB2SocketConnection(NetSocketInternal socket,
51+
ClientMetrics clientMetrics,
52+
DB2ConnectOptions connectOptions,
4853
boolean cachePreparedStatements,
4954
int preparedStatementCacheSize,
5055
Predicate<String> preparedStatementCacheSqlFilter,
5156
int pipeliningLimit,
5257
EventLoopContext context) {
53-
super(socket, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlFilter, pipeliningLimit, context);
58+
super(socket, clientMetrics, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlFilter, pipeliningLimit, context);
59+
this.connectOptions = connectOptions;
5460
}
5561

5662
// TODO RETURN FUTURE ???
@@ -63,6 +69,11 @@ void sendStartupMessage(String username,
6369
schedule(context, cmd).onComplete(completionHandler);
6470
}
6571

72+
@Override
73+
protected SqlConnectOptions connectOptions() {
74+
return connectOptions;
75+
}
76+
6677
@Override
6778
public void init() {
6879
codec = new DB2Codec(this);

‎vertx-db2-client/src/main/java/io/vertx/db2client/spi/DB2Driver.java

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import io.vertx.core.impl.ContextInternal;
2121
import io.vertx.core.impl.VertxInternal;
2222
import io.vertx.core.json.JsonObject;
23-
import io.vertx.core.spi.metrics.ClientMetrics;
24-
import io.vertx.core.spi.metrics.VertxMetrics;
2523
import io.vertx.db2client.DB2ConnectOptions;
2624
import io.vertx.db2client.impl.*;
2725
import io.vertx.sqlclient.Pool;
@@ -30,7 +28,6 @@
3028
import io.vertx.sqlclient.impl.Connection;
3129
import io.vertx.sqlclient.impl.PoolImpl;
3230
import io.vertx.sqlclient.impl.SqlConnectionInternal;
33-
import io.vertx.sqlclient.impl.tracing.QueryTracer;
3431
import io.vertx.sqlclient.spi.ConnectionFactory;
3532
import io.vertx.sqlclient.spi.Driver;
3633

@@ -56,12 +53,9 @@ public Pool newPool(Vertx vertx, Supplier<DB2ConnectOptions> databases, PoolOpti
5653

5754
private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<DB2ConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
5855
DB2ConnectOptions baseConnectOptions = DB2ConnectOptions.wrap(databases.get());
59-
QueryTracer tracer = vertx.tracer() == null ? null : new QueryTracer(vertx.tracer(), baseConnectOptions);
60-
VertxMetrics vertxMetrics = vertx.metricsSPI();
61-
ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(baseConnectOptions.getSocketAddress(), "sql", baseConnectOptions.getMetricsName()) : null;
6256
boolean pipelinedPool = options instanceof Db2PoolOptions && ((Db2PoolOptions) options).isPipelined();
6357
int pipeliningLimit = pipelinedPool ? baseConnectOptions.getPipeliningLimit() : 1;
64-
PoolImpl pool = new PoolImpl(vertx, this, tracer, metrics, pipeliningLimit, options, null, null, closeFuture);
58+
PoolImpl pool = new PoolImpl(vertx, this, pipeliningLimit, options, null, null, closeFuture);
6559
ConnectionFactory<DB2ConnectOptions> factory = createConnectionFactory(vertx, databases);
6660
pool.connectionProvider(context -> factory.connect(context, databases.get()));
6761
pool.init();
@@ -91,7 +85,7 @@ public ConnectionFactory<DB2ConnectOptions> createConnectionFactory(Vertx vertx,
9185
}
9286

9387
@Override
94-
public SqlConnectionInternal wrapConnection(ContextInternal context, ConnectionFactory<DB2ConnectOptions> factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
95-
return new DB2ConnectionImpl(context, factory, conn, tracer, metrics);
88+
public SqlConnectionInternal wrapConnection(ContextInternal context, ConnectionFactory<DB2ConnectOptions> factory, Connection conn) {
89+
return new DB2ConnectionImpl(context, factory, conn);
9690
}
9791
}

‎vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionFactory.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
import io.vertx.core.net.NetSocket;
2323
import io.vertx.core.net.SocketAddress;
2424
import io.vertx.core.net.impl.NetSocketInternal;
25+
import io.vertx.core.spi.metrics.ClientMetrics;
26+
import io.vertx.core.spi.metrics.VertxMetrics;
2527
import io.vertx.mssqlclient.MSSQLConnectOptions;
26-
import io.vertx.sqlclient.SqlConnectOptions;
2728
import io.vertx.sqlclient.SqlConnection;
2829
import io.vertx.sqlclient.impl.Connection;
2930
import io.vertx.sqlclient.impl.ConnectionFactoryBase;
30-
import io.vertx.sqlclient.impl.tracing.QueryTracer;
3131

3232
import java.util.Map;
3333
import java.util.function.Supplier;
@@ -55,7 +55,7 @@ private Future<Connection> connectOrRedirect(MSSQLConnectOptions options, EventL
5555
// Always start unencrypted, the connection will be upgraded if client and server agree
5656
NetClient netClient = netClient(new NetClientOptions(options).setSsl(false));
5757
return netClient.connect(server)
58-
.map(so -> createSocketConnection(so, desiredPacketSize, context))
58+
.map(so -> createSocketConnection(so, options, desiredPacketSize, context))
5959
.compose(conn -> conn.sendPreLoginMessage(clientSslConfig)
6060
.compose(encryptionLevel -> login(conn, options, encryptionLevel, context))
6161
)
@@ -71,8 +71,10 @@ private Future<Connection> connectOrRedirect(MSSQLConnectOptions options, EventL
7171
});
7272
}
7373

74-
private MSSQLSocketConnection createSocketConnection(NetSocket so, int desiredPacketSize, EventLoopContext context) {
75-
MSSQLSocketConnection conn = new MSSQLSocketConnection((NetSocketInternal) so, desiredPacketSize, false, 0, sql -> true, 1, context);
74+
private MSSQLSocketConnection createSocketConnection(NetSocket so, MSSQLConnectOptions options, int desiredPacketSize, EventLoopContext context) {
75+
VertxMetrics vertxMetrics = vertx.metricsSPI();
76+
ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(options.getSocketAddress(), "sql", options.getMetricsName()) : null;
77+
MSSQLSocketConnection conn = new MSSQLSocketConnection((NetSocketInternal) so, metrics, options, desiredPacketSize, false, 0, sql -> true, 1, context);
7678
conn.init();
7779
return conn;
7880
}
@@ -102,11 +104,10 @@ private Future<Connection> login(MSSQLSocketConnection conn, MSSQLConnectOptions
102104
@Override
103105
public Future<SqlConnection> connect(Context context, MSSQLConnectOptions options) {
104106
ContextInternal ctx = (ContextInternal) context;
105-
QueryTracer tracer = ctx.tracer() == null ? null : new QueryTracer(ctx.tracer(), options);
106107
Promise<SqlConnection> promise = ctx.promise();
107108
connect(asEventLoopContext(ctx), options)
108109
.map(conn -> {
109-
MSSQLConnectionImpl msConn = new MSSQLConnectionImpl(ctx, this, conn, tracer, null);
110+
MSSQLConnectionImpl msConn = new MSSQLConnectionImpl(ctx, this, conn);
110111
conn.init(msConn);
111112
return (SqlConnection)msConn;
112113
})

‎vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLConnectionImpl.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,21 @@
1515
import io.vertx.core.Handler;
1616
import io.vertx.core.Vertx;
1717
import io.vertx.core.impl.ContextInternal;
18-
import io.vertx.core.spi.metrics.ClientMetrics;
1918
import io.vertx.mssqlclient.MSSQLConnectOptions;
2019
import io.vertx.mssqlclient.MSSQLConnection;
2120
import io.vertx.mssqlclient.MSSQLInfo;
2221
import io.vertx.mssqlclient.spi.MSSQLDriver;
2322
import io.vertx.sqlclient.impl.Connection;
2423
import io.vertx.sqlclient.impl.SocketConnectionBase;
2524
import io.vertx.sqlclient.impl.SqlConnectionBase;
26-
import io.vertx.sqlclient.impl.tracing.QueryTracer;
2725
import io.vertx.sqlclient.spi.ConnectionFactory;
2826

2927
public class MSSQLConnectionImpl extends SqlConnectionBase<MSSQLConnectionImpl> implements MSSQLConnection {
3028

3129
private volatile Handler<MSSQLInfo> infoHandler;
3230

33-
public MSSQLConnectionImpl(ContextInternal context, ConnectionFactory factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
34-
super(context, factory, conn, MSSQLDriver.INSTANCE, tracer, metrics);
31+
public MSSQLConnectionImpl(ContextInternal context, ConnectionFactory factory, Connection conn) {
32+
super(context, factory, conn, MSSQLDriver.INSTANCE);
3533
}
3634

3735
public static Future<MSSQLConnection> connect(Vertx vertx, MSSQLConnectOptions options) {

‎vertx-mssql-client/src/main/java/io/vertx/mssqlclient/impl/MSSQLSocketConnection.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,15 @@
2323
import io.vertx.core.net.impl.NetSocketInternal;
2424
import io.vertx.core.net.impl.SSLHelper;
2525
import io.vertx.core.net.impl.SslHandshakeCompletionHandler;
26+
import io.vertx.core.spi.metrics.ClientMetrics;
2627
import io.vertx.mssqlclient.MSSQLConnectOptions;
2728
import io.vertx.mssqlclient.MSSQLInfo;
2829
import io.vertx.mssqlclient.impl.codec.TdsLoginSentCompletionHandler;
2930
import io.vertx.mssqlclient.impl.codec.TdsMessageCodec;
3031
import io.vertx.mssqlclient.impl.codec.TdsPacketDecoder;
3132
import io.vertx.mssqlclient.impl.codec.TdsSslHandshakeCodec;
3233
import io.vertx.mssqlclient.impl.command.PreLoginCommand;
34+
import io.vertx.sqlclient.SqlConnectOptions;
3335
import io.vertx.sqlclient.impl.Connection;
3436
import io.vertx.sqlclient.impl.QueryResultHandler;
3537
import io.vertx.sqlclient.impl.SocketConnectionBase;
@@ -43,22 +45,31 @@
4345

4446
public class MSSQLSocketConnection extends SocketConnectionBase {
4547

48+
private final MSSQLConnectOptions connectOptions;
4649
private final int packetSize;
4750

4851
private MSSQLDatabaseMetadata databaseMetadata;
4952
private SocketAddress alternateServer;
5053

5154
MSSQLSocketConnection(NetSocketInternal socket,
55+
ClientMetrics clientMetrics,
56+
MSSQLConnectOptions connectOptions,
5257
int packetSize,
5358
boolean cachePreparedStatements,
5459
int preparedStatementCacheSize,
5560
Predicate<String> preparedStatementCacheSqlFilter,
5661
int pipeliningLimit,
5762
EventLoopContext context) {
58-
super(socket, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlFilter, pipeliningLimit, context);
63+
super(socket, clientMetrics, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlFilter, pipeliningLimit, context);
64+
this.connectOptions = connectOptions;
5965
this.packetSize = packetSize;
6066
}
6167

68+
@Override
69+
protected SqlConnectOptions connectOptions() {
70+
return connectOptions;
71+
}
72+
6273
Future<Byte> sendPreLoginMessage(boolean clientConfigSsl) {
6374
PreLoginCommand cmd = new PreLoginCommand(clientConfigSsl);
6475
return schedule(context, cmd).map(resp -> {

‎vertx-mssql-client/src/main/java/io/vertx/mssqlclient/spi/MSSQLDriver.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
import io.vertx.core.impl.ContextInternal;
2121
import io.vertx.core.impl.VertxInternal;
2222
import io.vertx.core.json.JsonObject;
23-
import io.vertx.core.spi.metrics.ClientMetrics;
24-
import io.vertx.core.spi.metrics.VertxMetrics;
2523
import io.vertx.mssqlclient.MSSQLConnectOptions;
2624
import io.vertx.mssqlclient.impl.MSSQLConnectionFactory;
2725
import io.vertx.mssqlclient.impl.MSSQLConnectionImpl;
@@ -59,10 +57,7 @@ public Pool newPool(Vertx vertx, Supplier<MSSQLConnectOptions> databases, PoolOp
5957

6058
private PoolImpl newPoolImpl(VertxInternal vertx, Supplier<MSSQLConnectOptions> databases, PoolOptions options, CloseFuture closeFuture) {
6159
MSSQLConnectOptions baseConnectOptions = MSSQLConnectOptions.wrap(databases.get());
62-
QueryTracer tracer = vertx.tracer() == null ? null : new QueryTracer(vertx.tracer(), baseConnectOptions);
63-
VertxMetrics vertxMetrics = vertx.metricsSPI();
64-
ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(baseConnectOptions.getSocketAddress(), "sql", baseConnectOptions.getMetricsName()) : null;
65-
PoolImpl pool = new PoolImpl(vertx, this, tracer, metrics, 1, options, null, null, closeFuture);
60+
PoolImpl pool = new PoolImpl(vertx, this, 1, options, null, null, closeFuture);
6661
ConnectionFactory<MSSQLConnectOptions> factory = createConnectionFactory(vertx, databases);
6762
pool.connectionProvider(context -> factory.connect(context, databases.get()));
6863
pool.init();
@@ -98,7 +93,7 @@ public int appendQueryPlaceholder(StringBuilder queryBuilder, int index, int cur
9893
}
9994

10095
@Override
101-
public SqlConnectionInternal wrapConnection(ContextInternal context, ConnectionFactory<MSSQLConnectOptions> factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
102-
return new MSSQLConnectionImpl(context, factory, conn, tracer, metrics);
96+
public SqlConnectionInternal wrapConnection(ContextInternal context, ConnectionFactory<MSSQLConnectOptions> factory, Connection conn) {
97+
return new MSSQLConnectionImpl(context, factory, conn);
10398
}
10499
}

‎vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionFactory.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@
2020
import io.vertx.core.impl.VertxInternal;
2121
import io.vertx.core.net.*;
2222
import io.vertx.core.net.impl.NetSocketInternal;
23+
import io.vertx.core.spi.metrics.ClientMetrics;
24+
import io.vertx.core.spi.metrics.VertxMetrics;
2325
import io.vertx.mysqlclient.MySQLAuthenticationPlugin;
2426
import io.vertx.mysqlclient.MySQLConnectOptions;
2527
import io.vertx.mysqlclient.SslMode;
26-
import io.vertx.sqlclient.SqlConnectOptions;
2728
import io.vertx.sqlclient.SqlConnection;
2829
import io.vertx.sqlclient.impl.Connection;
2930
import io.vertx.sqlclient.impl.ConnectionFactoryBase;
30-
import io.vertx.sqlclient.impl.tracing.QueryTracer;
3131

3232
import java.nio.charset.Charset;
3333
import java.util.Map;
@@ -124,7 +124,9 @@ private Future<Connection> doConnect(MySQLConnectOptions options, SslMode sslMod
124124
MySQLAuthenticationPlugin authenticationPlugin = options.getAuthenticationPlugin();
125125
Future<NetSocket> fut = netClient(options).connect(server);
126126
return fut.flatMap(so -> {
127-
MySQLSocketConnection conn = new MySQLSocketConnection((NetSocketInternal) so, cachePreparedStatements, preparedStatementCacheMaxSize, preparedStatementCacheSqlFilter, pipeliningLimit, context);
127+
VertxMetrics vertxMetrics = vertx.metricsSPI();
128+
ClientMetrics metrics = vertxMetrics != null ? vertxMetrics.createClientMetrics(options.getSocketAddress(), "sql", options.getMetricsName()) : null;
129+
MySQLSocketConnection conn = new MySQLSocketConnection((NetSocketInternal) so, metrics, options, cachePreparedStatements, preparedStatementCacheMaxSize, preparedStatementCacheSqlFilter, pipeliningLimit, context);
128130
conn.init();
129131
return Future.future(promise -> conn.sendStartupMessage(username, password, database, collation, serverRsaPublicKey, properties, sslMode, initialCapabilitiesFlags, charsetEncoding, authenticationPlugin, promise));
130132
});
@@ -133,11 +135,10 @@ private Future<Connection> doConnect(MySQLConnectOptions options, SslMode sslMod
133135
@Override
134136
public Future<SqlConnection> connect(Context context, MySQLConnectOptions options) {
135137
ContextInternal contextInternal = (ContextInternal) context;
136-
QueryTracer tracer = contextInternal.tracer() == null ? null : new QueryTracer(contextInternal.tracer(), options);
137138
Promise<SqlConnection> promise = contextInternal.promise();
138139
connect(asEventLoopContext(contextInternal), options)
139140
.map(conn -> {
140-
MySQLConnectionImpl mySQLConnection = new MySQLConnectionImpl(contextInternal, this, conn, tracer, null);
141+
MySQLConnectionImpl mySQLConnection = new MySQLConnectionImpl(contextInternal, this, conn);
141142
conn.init(mySQLConnection);
142143
return (SqlConnection)mySQLConnection;
143144
})

‎vertx-mysql-client/src/main/java/io/vertx/mysqlclient/impl/MySQLConnectionImpl.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,9 @@
1111

1212
package io.vertx.mysqlclient.impl;
1313

14-
import io.vertx.core.AsyncResult;
1514
import io.vertx.core.Future;
16-
import io.vertx.core.Handler;
1715
import io.vertx.core.buffer.Buffer;
1816
import io.vertx.core.impl.ContextInternal;
19-
import io.vertx.core.spi.metrics.ClientMetrics;
2017
import io.vertx.mysqlclient.MySQLAuthOptions;
2118
import io.vertx.mysqlclient.MySQLConnectOptions;
2219
import io.vertx.mysqlclient.MySQLConnection;
@@ -25,7 +22,6 @@
2522
import io.vertx.mysqlclient.spi.MySQLDriver;
2623
import io.vertx.sqlclient.impl.Connection;
2724
import io.vertx.sqlclient.impl.SqlConnectionBase;
28-
import io.vertx.sqlclient.impl.tracing.QueryTracer;
2925
import io.vertx.sqlclient.spi.ConnectionFactory;
3026

3127
public class MySQLConnectionImpl extends SqlConnectionBase<MySQLConnectionImpl> implements MySQLConnection {
@@ -44,8 +40,8 @@ public static Future<MySQLConnection> connect(ContextInternal ctx, MySQLConnectO
4440
return (Future)client.connect(ctx, options);
4541
}
4642

47-
public MySQLConnectionImpl(ContextInternal context, ConnectionFactory factory, Connection conn, QueryTracer tracer, ClientMetrics metrics) {
48-
super(context, factory, conn, MySQLDriver.INSTANCE, tracer, metrics);
43+
public MySQLConnectionImpl(ContextInternal context, ConnectionFactory factory, Connection conn) {
44+
super(context, factory, conn, MySQLDriver.INSTANCE);
4945
}
5046

5147
@Override

0 commit comments

Comments
 (0)