This is an automated email from the ASF dual-hosted git repository. absurdfarce pushed a commit to branch request-traceability in repository https://gitbox.apache.org/repos/asf/cassandra-java-driver.git
commit 5ee2fb1a2fbe0fcc4336a875032627c87fa938c1 Author: absurdfarce <[email protected]> AuthorDate: Mon Oct 6 01:51:55 2025 -0500 Reverting to old method names --- .../datastax/oss/driver/api/core/tracker/RequestIdGenerator.java | 4 ++-- .../datastax/oss/driver/internal/core/cql/CqlRequestHandler.java | 4 ++-- .../oss/driver/internal/core/tracker/UuidRequestIdGenerator.java | 4 ++-- .../internal/core/tracker/W3CContextRequestIdGenerator.java | 4 ++-- .../oss/driver/internal/core/tracker/RequestIdGeneratorTest.java | 8 ++++---- .../datastax/oss/driver/core/tracker/RequestIdGeneratorIT.java | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/tracker/RequestIdGenerator.java b/core/src/main/java/com/datastax/oss/driver/api/core/tracker/RequestIdGenerator.java index 764b02a2f..8b410b571 100644 --- a/core/src/main/java/com/datastax/oss/driver/api/core/tracker/RequestIdGenerator.java +++ b/core/src/main/java/com/datastax/oss/driver/api/core/tracker/RequestIdGenerator.java @@ -44,7 +44,7 @@ public interface RequestIdGenerator { * * @return a unique identifier for the session request */ - String getParentId(); + String getSessionRequestId(); /** * Generates a unique identifier for the node request. This will be the identifier for the CQL @@ -56,7 +56,7 @@ public interface RequestIdGenerator { * @param parentId the session request identifier * @return a unique identifier for the node request */ - String getRequestId(@NonNull Request statement, @NonNull String parentId); + String getNodeRequestId(@NonNull Request statement, @NonNull String parentId); default String getCustomPayloadKey() { return "request-id"; diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandler.java b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandler.java index e956ce37b..f7d290d8b 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandler.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/cql/CqlRequestHandler.java @@ -151,7 +151,7 @@ public class CqlRequestHandler implements Throttled { this.sessionName = sessionName; this.sessionId = this.requestIdGenerator - .map((g) -> g.getParentId()) + .map((g) -> g.getSessionRequestId()) .orElse(Integer.toString(this.hashCode())); this.handlerLogPrefix = logPrefixJoiner.join(sessionName, sessionId); LOG.trace("[{}] Creating new handler for request {}", handlerLogPrefix, statement); @@ -284,7 +284,7 @@ public class CqlRequestHandler implements Throttled { Statement finalStatement = statement; String requestId = this.requestIdGenerator - .map((g) -> g.getRequestId(finalStatement, sessionId)) + .map((g) -> g.getNodeRequestId(finalStatement, sessionId)) .orElse(Integer.toString(this.hashCode())); statement = this.requestIdGenerator diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/UuidRequestIdGenerator.java b/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/UuidRequestIdGenerator.java index 407b81d93..cc07d6717 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/UuidRequestIdGenerator.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/UuidRequestIdGenerator.java @@ -28,7 +28,7 @@ public class UuidRequestIdGenerator implements RequestIdGenerator { /** Generates a random v4 UUID. */ @Override - public String getParentId() { + public String getSessionRequestId() { return Uuids.random().toString(); } @@ -37,7 +37,7 @@ public class UuidRequestIdGenerator implements RequestIdGenerator { * session request id */ @Override - public String getRequestId(@NonNull Request statement, @NonNull String parentId) { + public String getNodeRequestId(@NonNull Request statement, @NonNull String parentId) { return parentId + "-" + Uuids.random(); } } diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/W3CContextRequestIdGenerator.java b/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/W3CContextRequestIdGenerator.java index 8ee99a880..56b481b37 100644 --- a/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/W3CContextRequestIdGenerator.java +++ b/core/src/main/java/com/datastax/oss/driver/internal/core/tracker/W3CContextRequestIdGenerator.java @@ -35,7 +35,7 @@ public class W3CContextRequestIdGenerator implements RequestIdGenerator { /** Random 16 bytes, e.g. "4bf92f3577b34da6a3ce929d0e0e4736" */ @Override - public String getParentId() { + public String getSessionRequestId() { byte[] bytes = new byte[16]; random.nextBytes(bytes); return baseEncoding.encode(bytes); @@ -48,7 +48,7 @@ public class W3CContextRequestIdGenerator implements RequestIdGenerator { * request share the same "trace-id" field value */ @Override - public String getRequestId(@NonNull Request statement, @NonNull String parentId) { + public String getNodeRequestId(@NonNull Request statement, @NonNull String parentId) { byte[] bytes = new byte[8]; random.nextBytes(bytes); return String.format("00-%s-%s-00", parentId, baseEncoding.encode(bytes)); diff --git a/core/src/test/java/com/datastax/oss/driver/internal/core/tracker/RequestIdGeneratorTest.java b/core/src/test/java/com/datastax/oss/driver/internal/core/tracker/RequestIdGeneratorTest.java index 37011fb69..94ae7847f 100644 --- a/core/src/test/java/com/datastax/oss/driver/internal/core/tracker/RequestIdGeneratorTest.java +++ b/core/src/test/java/com/datastax/oss/driver/internal/core/tracker/RequestIdGeneratorTest.java @@ -36,8 +36,8 @@ public class RequestIdGeneratorTest { // given UuidRequestIdGenerator generator = new UuidRequestIdGenerator(context); // when - String parentId = generator.getParentId(); - String requestId = generator.getRequestId(statement, parentId); + String parentId = generator.getSessionRequestId(); + String requestId = generator.getNodeRequestId(statement, parentId); // then // e.g. "550e8400-e29b-41d4-a716-446655440000", which is 36 characters long assertThat(parentId.length()).isEqualTo(36); @@ -51,8 +51,8 @@ public class RequestIdGeneratorTest { // given W3CContextRequestIdGenerator generator = new W3CContextRequestIdGenerator(context); // when - String parentId = generator.getParentId(); - String requestId = generator.getRequestId(statement, parentId); + String parentId = generator.getSessionRequestId(); + String requestId = generator.getNodeRequestId(statement, parentId); // then // e.g. "4bf92f3577b34da6a3ce929d0e0e4736", which is 32 characters long assertThat(parentId.length()).isEqualTo(32); diff --git a/integration-tests/src/test/java/com/datastax/oss/driver/core/tracker/RequestIdGeneratorIT.java b/integration-tests/src/test/java/com/datastax/oss/driver/core/tracker/RequestIdGeneratorIT.java index ce93e9e8b..5cc99598d 100644 --- a/integration-tests/src/test/java/com/datastax/oss/driver/core/tracker/RequestIdGeneratorIT.java +++ b/integration-tests/src/test/java/com/datastax/oss/driver/core/tracker/RequestIdGeneratorIT.java @@ -80,12 +80,12 @@ public class RequestIdGeneratorIT { RequestIdGenerator myRequestIdGenerator = new RequestIdGenerator() { @Override - public String getParentId() { + public String getSessionRequestId() { return "123"; } @Override - public String getRequestId(@NonNull Request statement, @NonNull String parentId) { + public String getNodeRequestId(@NonNull Request statement, @NonNull String parentId) { return "456"; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
