Skip to content

Commit 09a63f1

Browse files
vietjvietj
committed
Take a stab at tracing
1 parent 93e6e0f commit 09a63f1

File tree

18 files changed

+404
-68
lines changed

18 files changed

+404
-68
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public DB2SocketConnection(NetSocketInternal socket,
4646
int preparedStatementCacheSqlLimit,
4747
int pipeliningLimit,
4848
ContextInternal context) {
49-
super(socket, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlLimit, pipeliningLimit, context);
49+
super(socket, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlLimit, pipeliningLimit, null, context);
5050
}
5151

5252
void sendStartupMessage(String username,

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
import io.vertx.sqlclient.impl.command.ExtendedBatchQueryCommand;
3232

3333
class ExtendedBatchQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedBatchQueryCommand<R>> {
34-
34+
3535
private static final Logger LOG = LoggerFactory.getLogger(ExtendedBatchQueryCommandCodec.class);
3636

3737
private final List<Tuple> params;
@@ -51,10 +51,10 @@ void encode(DB2Encoder encoder) {
5151
completionHandler.handle(CommandResponse.failure("Can not execute batch query with 0 sets of batch parameters."));
5252
return;
5353
}
54-
54+
5555
super.encode(encoder);
5656
}
57-
57+
5858
@Override
5959
void encodeQuery(DRDAQueryRequest req) {
6060
for (int i = 0; i < params.size(); i++) {
@@ -70,11 +70,11 @@ void encodeUpdate(DRDAQueryRequest req) {
7070
for (Tuple params : this.params) {
7171
encodePreparedUpdate(req, params);
7272
}
73-
if (cmd.autoCommit()) {
73+
if (cmd.isAutoCommit()) {
7474
req.buildRDBCMM();
7575
}
7676
}
77-
77+
7878
void decodeQuery(ByteBuf payload) {
7979
boolean hasMoreResults = true;
8080
DRDAQueryResponse resp = new DRDAQueryResponse(payload, encoder.connMetadata);
@@ -89,18 +89,18 @@ void decodeQuery(ByteBuf payload) {
8989
}
9090
completionHandler.handle(CommandResponse.success(hasMoreResults));
9191
}
92-
92+
9393
void decodeUpdate(ByteBuf payload) {
9494
DRDAQueryResponse updateResponse = new DRDAQueryResponse(payload, encoder.connMetadata);
9595
for (int i = 0; i < params.size(); i++) {
9696
handleUpdateResult(updateResponse);
9797
}
98-
if (cmd.autoCommit()) {
98+
if (cmd.isAutoCommit()) {
9999
updateResponse.readLocalCommit();
100100
}
101101
completionHandler.handle(CommandResponse.success(true));
102102
}
103-
103+
104104
@Override
105105
public String toString() {
106106
StringBuilder sb = new StringBuilder(super.toString());

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@
2323
import io.vertx.sqlclient.impl.command.ExtendedQueryCommand;
2424

2525
class ExtendedQueryCommandCodec<R> extends ExtendedQueryCommandBaseCodec<R, ExtendedQueryCommand<R>> {
26-
26+
2727
final QueryInstance queryInstance;
28-
28+
2929
ExtendedQueryCommandCodec(ExtendedQueryCommand<R> cmd) {
3030
super(cmd);
3131
queryInstance = statement.getQueryInstance(cmd.cursorId());
3232
}
33-
33+
3434
@Override
3535
void encodeQuery(DRDAQueryRequest req) {
3636
encodePreparedQuery(req, queryInstance, cmd.params());
3737
}
38-
38+
3939
@Override
4040
void encodeUpdate(DRDAQueryRequest req) {
4141
encodePreparedUpdate(req, cmd.params());
42-
if (cmd.autoCommit()) {
42+
if (cmd.isAutoCommit()) {
4343
req.buildRDBCMM();
4444
}
4545
}
@@ -51,16 +51,16 @@ void decodeQuery(ByteBuf payload) {
5151
handleQueryResult(decoder);
5252
completionHandler.handle(CommandResponse.success(hasMoreResults));
5353
}
54-
54+
5555
void decodeUpdate(ByteBuf payload) {
5656
DRDAQueryResponse updateResponse = new DRDAQueryResponse(payload, encoder.connMetadata);
5757
handleUpdateResult(updateResponse);
58-
if (cmd.autoCommit()) {
58+
if (cmd.isAutoCommit()) {
5959
updateResponse.readLocalCommit();
6060
}
6161
completionHandler.handle(CommandResponse.success(true));
6262
}
63-
63+
6464
@Override
6565
public String toString() {
6666
StringBuilder sb = new StringBuilder(super.toString());

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ public String toString() {
3838
sb.append(Integer.toHexString(hashCode()));
3939
sb.append(" sql=" + cmd.sql());
4040
if (!isQuery)
41-
sb.append(", autoCommit=" + cmd.autoCommit());
41+
sb.append(", autoCommit=" + cmd.isAutoCommit());
4242
return sb.toString();
4343
}
44-
44+
4545
@Override
4646
void encode(DB2Encoder encoder) {
4747
super.encode(encoder);
48-
48+
4949
ByteBuf packet = allocateBuffer();
5050
int packetStartIdx = packet.writerIndex();
5151
DRDAQueryRequest req = new DRDAQueryRequest(packet, encoder.connMetadata);
@@ -55,14 +55,14 @@ void encode(DB2Encoder encoder) {
5555
encodeUpdate(req);
5656
}
5757
req.completeCommand();
58-
58+
5959
sendPacket(packet, packet.writerIndex() - packetStartIdx);
6060
}
61-
61+
6262
abstract void encodeQuery(DRDAQueryRequest req);
63-
63+
6464
abstract void encodeUpdate(DRDAQueryRequest req);
65-
65+
6666
@Override
6767
void decodePayload(ByteBuf payload, int payloadLength) {
6868
if (isQuery) {
@@ -71,11 +71,11 @@ void decodePayload(ByteBuf payload, int payloadLength) {
7171
decodeUpdate(payload);
7272
}
7373
}
74-
74+
7575
abstract void decodeQuery(ByteBuf payload);
76-
76+
7777
abstract void decodeUpdate(ByteBuf payload);
78-
78+
7979
void handleQueryResult(RowResultDecoder<?, T> decoder) {
8080
Throwable failure = decoder.complete();
8181
T result = decoder.result();
@@ -85,5 +85,5 @@ void handleQueryResult(RowResultDecoder<?, T> decoder) {
8585
decoder.reset();
8686
cmd.resultHandler().handleResult(updatedCount, size, rowDesc, result, failure);
8787
}
88-
88+
8989
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ void encodeQuery(DRDAQueryRequest queryCommand) {
4747
void encodeUpdate(DRDAQueryRequest updateCommand) {
4848
querySection = encoder.connMetadata.sectionManager.getSection(cmd.sql());
4949
updateCommand.writeExecuteImmediate(cmd.sql(), querySection, encoder.connMetadata.databaseName);
50-
if (cmd.autoCommit()) {
50+
if (cmd.isAutoCommit()) {
5151
updateCommand.buildRDBCMM();
5252
}
5353

@@ -68,7 +68,7 @@ void decodeUpdate(ByteBuf payload) {
6868
T result = emptyResult(cmd.collector());
6969
cmd.resultHandler().handleResult(updatedCount, 0, null, result, null);
7070

71-
if (cmd.autoCommit()) {
71+
if (cmd.isAutoCommit()) {
7272
updateResponse.readLocalCommit();
7373
}
7474
completionHandler.handle(CommandResponse.success(true));
@@ -80,7 +80,7 @@ static <A, T> T emptyResult(Collector<Row, A, T> collector) {
8080

8181
void decodeQuery(ByteBuf payload) {
8282
querySection.release();
83-
83+
8484
DRDAQueryResponse resp = new DRDAQueryResponse(payload, encoder.connMetadata);
8585
resp.readPrepareDescribeOutput();
8686
resp.readBeginOpenQuery();
@@ -99,7 +99,7 @@ void decodeQuery(ByteBuf payload) {
9999
handleQueryResult(decoder);
100100
completionHandler.handle(CommandResponse.success(true));
101101
}
102-
102+
103103
@Override
104104
public String toString() {
105105
return super.toString() + ", section=" + querySection;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class MSSQLSocketConnection extends SocketConnectionBase {
3434
int preparedStatementCacheSqlLimit,
3535
int pipeliningLimit,
3636
ContextInternal context) {
37-
super(socket, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlLimit, pipeliningLimit, context);
37+
super(socket, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlLimit, pipeliningLimit, null, context);
3838
}
3939

4040
// command response should show what capabilities server provides

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public MySQLSocketConnection(NetSocketInternal socket,
4848
int preparedStatementCacheSize,
4949
int preparedStatementCacheSqlLimit,
5050
ContextInternal context) {
51-
super(socket, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlLimit, 1, context);
51+
super(socket, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlLimit, 1, null, context);
5252
}
5353

5454
void sendStartupMessage(String username,

‎vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgConnectionFactory.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import io.vertx.core.net.impl.NetSocketInternal;
2727
import io.vertx.core.net.*;
2828
import io.vertx.sqlclient.impl.ConnectionFactory;
29+
import io.vertx.sqlclient.impl.tracing.TracingManager;
2930

3031
import java.util.HashMap;
3132
import java.util.Map;
@@ -51,6 +52,7 @@ class PgConnectionFactory implements ConnectionFactory {
5152
private final int preparedStatementCacheSqlLimit;
5253
private final int pipeliningLimit;
5354
private final boolean isUsingDomainSocket;
55+
private final TracingManager tracingManager;
5456

5557
PgConnectionFactory(VertxInternal vertx, ContextInternal context, PgConnectOptions options) {
5658

@@ -75,6 +77,7 @@ class PgConnectionFactory implements ConnectionFactory {
7577
this.preparedStatementCacheSqlLimit = options.getPreparedStatementCacheSqlLimit();
7678
this.isUsingDomainSocket = options.isUsingDomainSocket();
7779
this.client = vertx.createNetClient(netClientOptions);
80+
this.tracingManager = context.tracer() != null ? new TracingManager(context.tracer(), options) : null;
7881
}
7982

8083
void close() {
@@ -166,6 +169,6 @@ private void doConnect(boolean ssl, Promise<Connection> promise) {
166169
}
167170

168171
private PgSocketConnection newSocketConnection(NetSocketInternal socket) {
169-
return new PgSocketConnection(socket, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlLimit, pipeliningLimit, context);
172+
return new PgSocketConnection(socket, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlLimit, pipeliningLimit, tracingManager, context);
170173
}
171174
}

‎vertx-pg-client/src/main/java/io/vertx/pgclient/impl/PgSocketConnection.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import io.vertx.sqlclient.impl.command.QueryCommandBase;
3535
import io.vertx.sqlclient.impl.command.SimpleQueryCommand;
3636
import io.vertx.sqlclient.impl.command.TxCommand;
37+
import io.vertx.sqlclient.impl.tracing.TracingManager;
3738

3839
import java.util.Map;
3940

@@ -51,8 +52,16 @@ public PgSocketConnection(NetSocketInternal socket,
5152
int preparedStatementCacheSize,
5253
int preparedStatementCacheSqlLimit,
5354
int pipeliningLimit,
55+
TracingManager tracingManager,
5456
ContextInternal context) {
55-
super(socket, cachePreparedStatements, preparedStatementCacheSize, preparedStatementCacheSqlLimit, pipeliningLimit, context);
57+
super(
58+
socket,
59+
cachePreparedStatements,
60+
preparedStatementCacheSize,
61+
preparedStatementCacheSqlLimit,
62+
pipeliningLimit,
63+
tracingManager,
64+
context);
5665
}
5766

5867
@Override

0 commit comments

Comments
 (0)